13 files changed, 122 insertions, 122 deletions
diff --git a/stdlib/source/library/lux/data/format/binary.lux b/stdlib/source/library/lux/data/format/binary.lux
index 55bf4bb79..c794c5b3d 100644
--- a/stdlib/source/library/lux/data/format/binary.lux
+++ b/stdlib/source/library/lux/data/format/binary.lux
@@ -1,27 +1,27 @@
 (.module:
   [library
-   [lux {"-" [and or nat int rev list type]}
+   [lux {"-" and or nat int rev list type}
     [abstract
-     [monoid {"+" [Monoid]}]
-     [monad {"+" [Monad do]}]
-     [equivalence {"+" [Equivalence]}]]
+     [monoid {"+" Monoid}]
+     [monad {"+" Monad do}]
+     [equivalence {"+" Equivalence}]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" function]
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      ["<>" parser ("[1]#[0]" monad)
-      ["/" binary {"+" [Offset Size Parser]}]]]
+      ["/" binary {"+" Offset Size Parser}]]]
     [data
      ["[0]" product]
-     ["[0]" binary {"+" [Binary]}]
+     ["[0]" binary {"+" Binary}]
      [text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" list]
-      ["[0]" row {"+" [Row]} ("[1]#[0]" functor)]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" row {"+" Row} ("[1]#[0]" functor)]
+      ["[0]" set {"+" Set}]]]
     [math
      [number
       ["[0]" i64]
diff --git a/stdlib/source/library/lux/data/format/css.lux b/stdlib/source/library/lux/data/format/css.lux
index 8d44055ea..4d67a3780 100644
--- a/stdlib/source/library/lux/data/format/css.lux
+++ b/stdlib/source/library/lux/data/format/css.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux {"-" [and]}
+   [lux {"-" and}
     [control
      ["[0]" maybe]]
     [data
      [number
       ["[0]" nat]]
      ["[0]" text
-      ["%" format {"+" [format]}]
-      ["[0]" encoding {"+" [Encoding]}]]
+      ["%" format {"+" format}]
+      ["[0]" encoding {"+" Encoding}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [type
      abstract]
     [world
-     [net {"+" [URL]}]]]]
+     [net {"+" URL}]]]]
   ["[0]" / "_"
-   ["[1][0]" selector {"+" [Selector Combinator]}]
-   ["[1][0]" value {"+" [Value Animation Percentage]}]
-   ["[1][0]" font {"+" [Font]}]
-   ["[1][0]" style {"+" [Style]}]
-   ["[1][0]" query {"+" [Query]}]])
+   ["[1][0]" selector {"+" Selector Combinator}]
+   ["[1][0]" value {"+" Value Animation Percentage}]
+   ["[1][0]" font {"+" Font}]
+   ["[1][0]" style {"+" Style}]
+   ["[1][0]" query {"+" Query}]])
 
 (abstract: .public Common Any)
 (abstract: .public Special Any)
diff --git a/stdlib/source/library/lux/data/format/css/font.lux b/stdlib/source/library/lux/data/format/css/font.lux
index abfa332d1..8abcf2858 100644
--- a/stdlib/source/library/lux/data/format/css/font.lux
+++ b/stdlib/source/library/lux/data/format/css/font.lux
@@ -7,11 +7,11 @@
      [parser
       ["s" code]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]]
+     [syntax {"+" syntax:}]]
     [world
-     [net {"+" [URL]}]]]]
+     [net {"+" URL}]]]]
   ["[0]" // "_"
-   ["[1][0]" value {"+" [Value Font_Stretch Font_Style Font_Weight]}]])
+   ["[1][0]" value {"+" Value Font_Stretch Font_Style Font_Weight}]])
 
 (type: .public Unicode_Range
   (Record
diff --git a/stdlib/source/library/lux/data/format/css/property.lux b/stdlib/source/library/lux/data/format/css/property.lux
index ea9ca5a93..a2c5a6d50 100644
--- a/stdlib/source/library/lux/data/format/css/property.lux
+++ b/stdlib/source/library/lux/data/format/css/property.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" [All Cursor]}
+   [lux {"-" All Cursor}
     [control
      [parser
       ["s" code]]]
@@ -9,48 +9,48 @@
     [macro
      ["[0]" template]
      ["[0]" code]
-     [syntax {"+" [syntax:]}]]]]
+     [syntax {"+" syntax:}]]]]
   [//
-   [value {"+" [All
-                Number
-                Length Thickness Time
-                Color
-                Location Fit
-                Slice
-                Alignment Animation_Direction
-                Animation Animation_Fill
-                Column_Fill Column_Span
-                Iteration Count
-                Play
-                Timing Visibility Attachment
-                Blend Span Image
-                Angle Repeat Border
-                Collapse Box_Decoration_Break Caption
-                Float Clear
-                Content
-                Cursor
-                Shadow Clip
-                Text_Direction
-                Display Empty
-                Filter
-                Flex_Direction Flex_Wrap
-                Font Font_Kerning Font_Size Font_Variant
-                Grid Grid_Content Grid_Flow Grid_Span Grid_Template
-                Hanging_Punctuation Hyphens Isolation
-                List_Style_Position List_Style_Type
-                Overflow Page_Break Pointer_Events
-                Position
-                Quotes
-                Resize Scroll_Behavior Table_Layout
-                Text_Align Text_Align_Last
-                Text_Decoration_Line Text_Decoration_Style
-                Text_Justification Text_Overflow Text_Transform
-                Transform Transform_Origin Transform_Style
-                Transition
-                Bidi User_Select
-                Vertical_Align
-                White_Space Word_Break Word_Wrap Writing_Mode
-                Z_Index]}]])
+   [value {"+" All
+           Number
+           Length Thickness Time
+           Color
+           Location Fit
+           Slice
+           Alignment Animation_Direction
+           Animation Animation_Fill
+           Column_Fill Column_Span
+           Iteration Count
+           Play
+           Timing Visibility Attachment
+           Blend Span Image
+           Angle Repeat Border
+           Collapse Box_Decoration_Break Caption
+           Float Clear
+           Content
+           Cursor
+           Shadow Clip
+           Text_Direction
+           Display Empty
+           Filter
+           Flex_Direction Flex_Wrap
+           Font Font_Kerning Font_Size Font_Variant
+           Grid Grid_Content Grid_Flow Grid_Span Grid_Template
+           Hanging_Punctuation Hyphens Isolation
+           List_Style_Position List_Style_Type
+           Overflow Page_Break Pointer_Events
+           Position
+           Quotes
+           Resize Scroll_Behavior Table_Layout
+           Text_Align Text_Align_Last
+           Text_Decoration_Line Text_Decoration_Style
+           Text_Justification Text_Overflow Text_Transform
+           Transform Transform_Origin Transform_Style
+           Transition
+           Bidi User_Select
+           Vertical_Align
+           White_Space Word_Break Word_Wrap Writing_Mode
+           Z_Index}]])
 
 (syntax: (text_identifier [identifier s.text])
   (in (list (code.local_identifier (text.replaced "-" "_" identifier)))))
diff --git a/stdlib/source/library/lux/data/format/css/query.lux b/stdlib/source/library/lux/data/format/css/query.lux
index 21058fea9..2af4d0f68 100644
--- a/stdlib/source/library/lux/data/format/css/query.lux
+++ b/stdlib/source/library/lux/data/format/css/query.lux
@@ -1,25 +1,25 @@
 (.module:
   [library
-   [lux {"-" [and or not]}
+   [lux {"-" and or not}
     [control
      [parser
       ["s" code]]]
     [data
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [macro
      ["[0]" template]
      ["[0]" code]
-     [syntax {"+" [syntax:]}]]
+     [syntax {"+" syntax:}]]
     [type
      abstract]]]
   ["[0]" // "_"
-   ["[1][0]" value {"+" [Value Length Count Resolution Ratio
-                         Orientation Scan Boolean Update
-                         Block_Overflow Inline_Overflow
-                         Display_Mode Color_Gamut Inverted_Colors
-                         Pointer Hover
-                         Light Scripting Motion Color_Scheme]}]])
+   ["[1][0]" value {"+" Value Length Count Resolution Ratio
+                    Orientation Scan Boolean Update
+                    Block_Overflow Inline_Overflow
+                    Display_Mode Color_Gamut Inverted_Colors
+                    Pointer Hover
+                    Light Scripting Motion Color_Scheme}]])
 
 (syntax: (text_identifier [identifier s.text])
   (in (list (code.local_identifier (text.replaced "-" "_" identifier)))))
diff --git a/stdlib/source/library/lux/data/format/css/selector.lux b/stdlib/source/library/lux/data/format/css/selector.lux
index 0ad018e6c..3cb2f5777 100644
--- a/stdlib/source/library/lux/data/format/css/selector.lux
+++ b/stdlib/source/library/lux/data/format/css/selector.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux {"-" [or and for same? not]}
+   [lux {"-" or and for same? not}
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [number
       ["i" int]]]
     [type
      abstract]
     [macro
      ["[0]" template]]
-    ["[0]" locale {"+" [Locale]}]]])
+    ["[0]" locale {"+" Locale}]]])
 
 (type: .public Label Text)
 
diff --git a/stdlib/source/library/lux/data/format/css/style.lux b/stdlib/source/library/lux/data/format/css/style.lux
index b41d9c9b7..6ea77b534 100644
--- a/stdlib/source/library/lux/data/format/css/style.lux
+++ b/stdlib/source/library/lux/data/format/css/style.lux
@@ -3,12 +3,12 @@
    [lux "*"
     [data
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [type
      abstract]]]
   ["[0]" // "_"
-   ["[1][0]" value {"+" [Value]}]
-   ["[1][0]" property {"+" [Property]}]])
+   ["[1][0]" value {"+" Value}]
+   ["[1][0]" property {"+" Property}]])
 
 (abstract: .public Style
   Text
diff --git a/stdlib/source/library/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux
index 7817c9769..f2c8bb1c3 100644
--- a/stdlib/source/library/lux/data/format/css/value.lux
+++ b/stdlib/source/library/lux/data/format/css/value.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" [All Cursor and static false true]}
+   [lux {"-" All Cursor and static false true}
     [control
      ["[0]" maybe]
      [parser
@@ -14,7 +14,7 @@
       ["r" rev]
       ["f" frac]]
      ["[0]" text
-      ["%" format {"+" [Format format]}]]
+      ["%" format {"+" Format format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [type
@@ -22,11 +22,11 @@
     [macro
      ["[0]" template]
      ["[0]" code]
-     [syntax {"+" [syntax:]}]]
+     [syntax {"+" syntax:}]]
     [world
-     [net {"+" [URL]}]]]]
+     [net {"+" URL}]]]]
   [//
-   [selector {"+" [Label]}]])
+   [selector {"+" Label}]])
 
 (syntax: (text_identifier [identifier s.text])
   (in (list (code.local_identifier (text.replaced "-" "_" identifier)))))
diff --git a/stdlib/source/library/lux/data/format/html.lux b/stdlib/source/library/lux/data/format/html.lux
index 1813d46db..b74f5d1d8 100644
--- a/stdlib/source/library/lux/data/format/html.lux
+++ b/stdlib/source/library/lux/data/format/html.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux {"-" [Meta Source comment and]}
+   [lux {"-" Meta Source comment and}
     [control
      ["[0]" function]
      ["[0]" maybe ("[1]#[0]" functor)]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [type
@@ -17,12 +17,12 @@
     [macro
      ["[0]" template]]
     [world
-     [net {"+" [URL]}]]]]
+     [net {"+" URL}]]]]
   [//
    [css
     ["[0]" selector]
-    ["[0]" style {"+" [Style]}]]
-   ["[0]" xml {"+" [XML]}]])
+    ["[0]" style {"+" Style}]]
+   ["[0]" xml {"+" XML}]])
 
 (type: .public Tag selector.Tag)
 (type: .public ID selector.ID)
diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux
index 342e847f4..0a160e2ff 100644
--- a/stdlib/source/library/lux/data/format/json.lux
+++ b/stdlib/source/library/lux/data/format/json.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
    [lux "*"
-    ["[0]" meta {"+" [monad]}]
+    ["[0]" meta {"+" monad}]
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [codec {"+" [Codec]}]
-     [predicate {"+" [Predicate]}]
-     ["[0]" monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [codec {"+" Codec}]
+     [predicate {"+" Predicate}]
+     ["[0]" monad {"+" do}]]
     [control
      pipe
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      ["<>" parser ("[1]#[0]" monad)
-      ["<[0]>" text {"+" [Parser]}]
+      ["<[0]>" text {"+" Parser}]
       ["<[0]>" code]]]
     [data
      ["[0]" bit]
@@ -20,10 +20,10 @@
      ["[0]" text ("[1]#[0]" equivalence monoid)]
      [collection
       ["[0]" list ("[1]#[0]" mix functor)]
-      ["[0]" row {"+" [Row row]} ("[1]#[0]" monad)]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" row {"+" Row row} ("[1]#[0]" monad)]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
      [number
diff --git a/stdlib/source/library/lux/data/format/markdown.lux b/stdlib/source/library/lux/data/format/markdown.lux
index 0737bc52b..70f81b10b 100644
--- a/stdlib/source/library/lux/data/format/markdown.lux
+++ b/stdlib/source/library/lux/data/format/markdown.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux {"-" [and]}
+   [lux {"-" and}
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [type
      abstract]
     [world
-     [net {"+" [URL]}]]]])
+     [net {"+" URL}]]]])
 
 ... https://www.markdownguide.org/basic-syntax/
 
diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux
index 8306aeaf5..96448c214 100644
--- a/stdlib/source/library/lux/data/format/tar.lux
+++ b/stdlib/source/library/lux/data/format/tar.lux
@@ -1,32 +1,32 @@
 (.module:
   [library
-   [lux {"-" [Mode Name and]}
+   [lux {"-" Mode Name and}
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     [pipe {"+" case>}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" binary {"+" [Parser]}]]]
+      ["<[0]>" binary {"+" Parser}]]]
     [data
      ["[0]" product]
-     ["[0]" binary {"+" [Binary]}]
-     ["[0]" text {"+" [Char]}
-      ["%" format {"+" [format]}]
+     ["[0]" binary {"+" Binary}]
+     ["[0]" text {"+" Char}
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      ["[0]" format "_"
-      ["[1]" binary {"+" [Writer]} ("[1]#[0]" monoid)]]
+      ["[1]" binary {"+" Writer} ("[1]#[0]" monoid)]]
      [collection
       ["[0]" list ("[1]#[0]" mix)]
-      ["[0]" row {"+" [Row]} ("[1]#[0]" mix)]]]
+      ["[0]" row {"+" Row} ("[1]#[0]" mix)]]]
     [math
      ["[0]" number
       ["n" nat]
       ["[0]" i64]]]
     [time
-     ["[0]" instant {"+" [Instant]}]
+     ["[0]" instant {"+" Instant}]
      ["[0]" duration]]
     [world
      ["[0]" file]]
diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux
index 42f5aafcf..df6642565 100644
--- a/stdlib/source/library/lux/data/format/xml.lux
+++ b/stdlib/source/library/lux/data/format/xml.lux
@@ -2,20 +2,20 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]
-     [equivalence {"+" [Equivalence]}]
-     [codec {"+" [Codec]}]]
+     [monad {"+" do}]
+     [equivalence {"+" Equivalence}]
+     [codec {"+" Codec}]]
     [control
-     [try {"+" [Try]}]
+     [try {"+" Try}]
      ["<>" parser ("[1]#[0]" monad)
-      ["<[0]>" text {"+" [Parser]}]]]
+      ["<[0]>" text {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" name ("[1]#[0]" equivalence codec)]
-     ["[0]" text {"+" [\n]} ("[1]#[0]" equivalence monoid)]
+     ["[0]" text {"+" \n} ("[1]#[0]" equivalence monoid)]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [math
      [number
       ["n" nat]