Updated only/except import syntax to take into account record => variant syntax change.

189 files changed, 1286 insertions, 1286 deletions

diff --git a/stdlib/source/library/lux/tool/compiler/default/init.lux b/stdlib/source/library/lux/tool/compiler/default/init.lux
index 395d7dc73..8abaa949c 100644
--- a/stdlib/source/library/lux/tool/compiler/default/init.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/init.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux {"-" [Module]}
-    ["@" target {"+" [Target]}]
+   [lux {"-" Module}
+    ["@" target {"+" Target}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" dictionary]
@@ -21,32 +21,32 @@
     [world
      ["[0]" file]]]]
   ["[0]" // "_"
-   ["/[1]" // {"+" [Instancer]}
+   ["/[1]" // {"+" Instancer}
     ["[1][0]" phase]
     [language
      [lux
-      [program {"+" [Program]}]
+      [program {"+" Program}]
       ["[1][0]" version]
-      ["[1][0]" syntax {"+" [Aliases]}]
+      ["[1][0]" syntax {"+" Aliases}]
       ["[1][0]" synthesis]
-      ["[1][0]" directive {"+" [Requirements]}]
+      ["[1][0]" directive {"+" Requirements}]
       ["[1][0]" generation]
       ["[1][0]" analysis
-       [macro {"+" [Expander]}]
+       [macro {"+" Expander}]
        ["[1]/[0]" evaluation]]
       [phase
        ["[0]P" synthesis]
        ["[0]P" directive]
        ["[0]P" analysis
         ["[0]" module]]
-       ["[0]" extension {"+" [Extender]}
+       ["[0]" extension {"+" Extender}
         ["[0]E" analysis]
         ["[0]E" synthesis]
         [directive
          ["[0]D" lux]]]]]]
     [meta
-     ["[0]" archive {"+" [Archive]}
-      ["[0]" descriptor {"+" [Module]}]
+     ["[0]" archive {"+" Archive}
+      ["[0]" descriptor {"+" Module}]
       ["[0]" artifact]
       ["[0]" document]]]]
    ])
diff --git a/stdlib/source/library/lux/tool/compiler/default/platform.lux b/stdlib/source/library/lux/tool/compiler/default/platform.lux
index 52396656b..64bef708c 100644
--- a/stdlib/source/library/lux/tool/compiler/default/platform.lux
+++ b/stdlib/source/library/lux/tool/compiler/default/platform.lux
@@ -1,66 +1,66 @@
 (.module:
   [library
-   [lux {"-" [Module]}
-    [type {"+" [:sharing]}]
+   [lux {"-" Module}
+    [type {"+" :sharing}]
     ["@" target]
     ["[0]" debug]
     [abstract
-     ["[0]" monad {"+" [Monad do]}]]
+     ["[0]" monad {"+" Monad do}]]
     [control
      ["[0]" function]
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]} ("[1]#[0]" monad)]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" try {"+" Try} ("[1]#[0]" monad)]
+     ["[0]" exception {"+" exception:}]
      [concurrency
-      ["[0]" async {"+" [Async Resolver]} ("[1]#[0]" monad)]
-      ["[0]" stm {"+" [Var STM]}]]]
+      ["[0]" async {"+" Async Resolver} ("[1]#[0]" monad)]
+      ["[0]" stm {"+" Var STM}]]]
     [data
-     ["[0]" binary {"+" [Binary]}]
+     ["[0]" binary {"+" Binary}]
      ["[0]" bit]
      ["[0]" product]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
-      ["[0]" row {"+" [Row]} ("[1]#[0]" mix)]
-      ["[0]" set {"+" [Set]}]
+      ["[0]" dictionary {"+" Dictionary}]
+      ["[0]" row {"+" Row} ("[1]#[0]" mix)]
+      ["[0]" set {"+" Set}]
       ["[0]" list ("[1]#[0]" monoid functor mix)]]
      [format
-      ["_" binary {"+" [Writer]}]]]
+      ["_" binary {"+" Writer}]]]
     [world
-     ["[0]" file {"+" [Path]}]]]]
+     ["[0]" file {"+" Path}]]]]
   ["[0]" // "_"
    ["[1][0]" init]
    ["/[1]" //
-    ["[1][0]" phase {"+" [Phase]}]
+    ["[1][0]" phase {"+" Phase}]
     [language
      [lux
-      [program {"+" [Program]}]
+      [program {"+" Program}]
       ["$" /]
       ["[1][0]" version]
       ["[0]" syntax]
       ["[1][0]" analysis
-       [macro {"+" [Expander]}]]
+       [macro {"+" Expander}]]
       ["[1][0]" synthesis]
-      ["[1][0]" generation {"+" [Buffer]}]
+      ["[1][0]" generation {"+" Buffer}]
       ["[1][0]" directive]
       [phase
-       ["[0]" extension {"+" [Extender]}]
+       ["[0]" extension {"+" Extender}]
        [analysis
         ["[0]" module]]]]]
     [meta
-     ["[0]" archive {"+" [Output Archive]}
-      ["[0]" artifact {"+" [Registry]}]
-      ["[0]" descriptor {"+" [Descriptor Module]}]
-      ["[0]" document {"+" [Document]}]]
-     [io {"+" [Context]}
+     ["[0]" archive {"+" Output Archive}
+      ["[0]" artifact {"+" Registry}]
+      ["[0]" descriptor {"+" Descriptor Module}]
+      ["[0]" document {"+" Document}]]
+     [io {"+" Context}
       ["[0]" context]
       ["ioW" archive]]]]]
   [program
    [compositor
-    [cli {"+" [Compilation Library]}]
-    [import {"+" [Import]}]
-    ["[0]" static {"+" [Static]}]]])
+    [cli {"+" Compilation Library}]
+    [import {"+" Import}]
+    ["[0]" static {"+" Static}]]])
 
 (with_expansions [<type_vars> (as_is anchor expression directive)
                   <Operation> (as_is ///generation.Operation <type_vars>)]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux.lux
index e8029aedc..3161bee88 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux.lux
@@ -3,10 +3,10 @@
    [lux "*"
     [control
      ["<>" parser
-      ["<b>" binary {"+" [Parser]}]]]
+      ["<b>" binary {"+" Parser}]]]
     [data
      [format
-      ["_" binary {"+" [Writer]}]]]]]
+      ["_" binary {"+" Writer}]]]]]
   ["[0]" / "_"
    ["[1][0]" version]
    [phase
@@ -16,7 +16,7 @@
     [meta
      [archive
       ["[0]" signature]
-      ["[0]" key {"+" [Key]}]]]]])
+      ["[0]" key {"+" Key}]]]]])
 
 ... TODO: Remove #module_hash, #imports & #module_state ASAP.
 ... TODO: Not just from this parser, but from the lux.Module type.
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
index eca75863c..feab22f2c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux {"-" [Tuple Variant nat int rev]}
+   [lux {"-" Tuple Variant nat int rev}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [hash {"+" [Hash]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [hash {"+" Hash}]
+     [monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" maybe]
      ["[0]" try]
-     ["[0]" exception {"+" [Exception]}]]
+     ["[0]" exception {"+" Exception}]]
     [data
      ["[0]" product]
      ["[0]" bit ("[1]#[0]" equivalence)]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [Format format]}]]
+      ["%" format {"+" Format format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [math
@@ -27,13 +27,13 @@
      ["[0]" location]]]]
   [//
    [phase
-    ["[0]" extension {"+" [Extension]}]]
+    ["[0]" extension {"+" Extension}]]
    [///
-    [arity {"+" [Arity]}]
-    [version {"+" [Version]}]
+    [arity {"+" Arity}]
+    [version {"+" Version}]
     ["[0]" phase]
-    ["[0]" reference {"+" [Reference]}
-     ["[0]" variable {"+" [Register Variable]}]]]])
+    ["[0]" reference {"+" Reference}
+     ["[0]" variable {"+" Register Variable}]]]])
 
 (type: .public Primitive
   (.Variant
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux
index 5a7ca089f..a760d2ec9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/evaluation.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     ["[0]" meta]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try]]
     [math
      [number
       ["n" nat]]]]]
-  ["[0]" // {"+" [Operation]}
-   [macro {"+" [Expander]}]
+  ["[0]" // {"+" Operation}
+   [macro {"+" Expander}]
    [//
     [phase
      ["[0]P" extension]
@@ -19,12 +19,12 @@
       ["[0]" type]]
      [//
       ["[0]" synthesis]
-      ["[0]" generation {"+" [Context]}]
+      ["[0]" generation {"+" Context}]
       [///
        ["[0]" phase]
        [meta
-        [archive {"+" [Archive]}
-         [descriptor {"+" [Module]}]]]]]]]])
+        [archive {"+" Archive}
+         [descriptor {"+" Module}]]]]]]]])
 
 (type: .public Eval
   (-> Archive Type Code (Operation Any)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux
index 428e8011a..95f1e980f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/macro.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     ["[0]" meta]]]
   [/////
    ["[0]" phase]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux
index e2ccfa37d..0dd610bc4 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/directive.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try]]
     [data
@@ -18,7 +18,7 @@
     ["[0]" phase]
     [meta
      [archive
-      [descriptor {"+" [Module]}]]]]])
+      [descriptor {"+" Module}]]]]])
 
 (type: .public (Component state phase)
   (Record
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux
index ca66425c5..9c2d930ef 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/generation.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      ["[0]" function]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      ["[0]" name]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" row {"+" [Row]}]
+      ["[0]" row {"+" Row}]
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
      [number
       ["n" nat]]]]]
   [//
-   [synthesis {"+" [Synthesis]}]
+   [synthesis {"+" Synthesis}]
    [phase
     ["[0]" extension]]
    [///
     ["[0]" phase]
     [meta
-     ["[0]" archive {"+" [Archive]}
-      ["[0]" descriptor {"+" [Module]}]
+     ["[0]" archive {"+" Archive}
+      ["[0]" descriptor {"+" Module}]
       ["[0]" artifact]]]]])
 
 (type: .public Context
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
index c3b6434d2..22840635e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis.lux
@@ -2,12 +2,12 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list]]]
     [math
@@ -25,13 +25,13 @@
    ["/[1]" // "_"
     ["[1][0]" extension]
     ["/[1]" // "_"
-     ["/" analysis {"+" [Analysis Operation Phase]}
-      ["[1][0]" macro {"+" [Expander]}]]
+     ["/" analysis {"+" Analysis Operation Phase}
+      ["[1][0]" macro {"+" Expander}]]
      [///
       ["//" phase]
       ["[0]" reference]
       [meta
-       [archive {"+" [Archive]}]]]]]])
+       [archive {"+" Archive}]]]]]])
 
 (exception: .public (unrecognized_syntax [code Code])
   (exception.report
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
index 99beefca5..95fdfdc45 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux {"-" [case]}
+   [lux {"-" case}
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe]
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" mix monoid monad)]]]
     [math
@@ -22,7 +22,7 @@
     ["[0]" type
      ["[0]" check]]]]
   ["[0]" / "_"
-   ["[1][0]" coverage {"+" [Coverage]}]
+   ["[1][0]" coverage {"+" Coverage}]
    ["/[1]" // "_"
     ["[1][0]" scope]
     ["[1][0]" type]
@@ -30,7 +30,7 @@
     ["/[1]" // "_"
      ["[1][0]" extension]
      [//
-      ["/" analysis {"+" [Pattern Analysis Operation Phase]}]
+      ["/" analysis {"+" Pattern Analysis Operation Phase}]
       [///
        ["[1]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
index 70be9ca49..19a00d406 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/case/coverage.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux {"-" [Variant]}
+   [lux {"-" Variant}
     [abstract
      equivalence
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]} ("[1]#[0]" monad)]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" try {"+" Try} ("[1]#[0]" monad)]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" bit ("[1]#[0]" equivalence)]
      ["[0]" text
-      ["%" format {"+" [Format format]}]]
+      ["%" format {"+" Format format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [math
      [number
       ["n" nat]]]]]
   ["[0]" //// "_"
    [//
-    ["/" analysis {"+" [Pattern Variant Operation]}]
+    ["/" analysis {"+" Pattern Variant Operation}]
     [///
      ["[1]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux
index 3993d77d4..951e367dc 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/function.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux {"-" [function]}
+   [lux {"-" function}
     [abstract
      monad]
     [control
      ["[0]" maybe]
-     ["ex" exception {"+" [exception:]}]]
+     ["ex" exception {"+" exception:}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" monoid monad)]]]
     ["[0]" type
@@ -21,11 +21,11 @@
    ["/[1]" // "_"
     ["[1][0]" extension]
     [//
-     ["/" analysis {"+" [Analysis Operation Phase]}]
+     ["/" analysis {"+" Analysis Operation Phase}]
      [///
       ["[1]" phase]
-      [reference {"+" []}
-       [variable {"+" []}]]]]]])
+      [reference {"+"}
+       [variable {"+"}]]]]]])
 
 (exception: .public (cannot_analyse [expected Type
                                      function Text
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux
index 0ec812b80..e031e8234 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/inference.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" maybe]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor monoid)]]]
     [math
@@ -22,11 +22,11 @@
    ["/[1]" // "_"
     ["[1][0]" extension]
     [//
-     ["/" analysis {"+" [Tag Analysis Operation Phase]}]
+     ["/" analysis {"+" Tag Analysis Operation Phase}]
      [///
       ["[1]" phase ("[1]#[0]" monad)]
       [meta
-       [archive {"+" [Archive]}]]]]]])
+       [archive {"+" Archive}]]]]]])
 
 (exception: .public (variant_tag_out_of_bounds [size Nat
                                                 tag Tag
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux
index 0999bd516..0b05afdeb 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/module.lux
@@ -2,14 +2,14 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      pipe
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" mix functor)]
       [dictionary
@@ -18,7 +18,7 @@
   ["[0]" /// "_"
    ["[1][0]" extension]
    [//
-    ["/" analysis {"+" [Operation]}]
+    ["/" analysis {"+" Operation}]
     [///
      ["[1]" phase]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
index fe8c61096..7a18d4359 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/primitive.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux {"-" [nat int rev]}
+   [lux {"-" nat int rev}
     [abstract
      monad]]]
   ["[0]" // "_"
    ["[1][0]" type]
    ["/[1]" // "_"
     [//
-     ["/" analysis {"+" [Analysis Operation]}]
+     ["/" analysis {"+" Analysis Operation}]
      [///
       ["[1]" phase]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
index f8f3aca6b..d80069d47 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/reference.lux
@@ -4,18 +4,18 @@
     [abstract
      monad]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     ["[0]" meta]
     [data
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]]]]
+      ["%" format {"+" format}]]]]]
   ["[0]" // "_"
    ["[1][0]" scope]
    ["[1][0]" type]
    ["/[1]" // "_"
     ["[1][0]" extension]
     [//
-     ["/" analysis {"+" [Analysis Operation]}]
+     ["/" analysis {"+" Analysis Operation}]
      [///
       ["[1][0]" reference]
       ["[1]" phase]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux
index ae2ff1ce7..e7a30e10f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/scope.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [local]}
+   [lux {"-" local}
     [abstract
      monad]
     [control
      ["[0]" maybe ("[1]#[0]" monad)]
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)]
      ["[0]" product]
@@ -17,10 +17,10 @@
   ["[0]" /// "_"
    ["[1][0]" extension]
    [//
-    ["/" analysis {"+" [Operation Phase]}]
+    ["/" analysis {"+" Operation Phase}]
     [///
      [reference
-      ["[0]" variable {"+" [Register Variable]}]]
+      ["[0]" variable {"+" Register Variable}]]
      ["[1]" phase]]]])
 
 (type: Local
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/structure.lux
index 27dd0dd72..c01f6970b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/structure.lux
@@ -3,20 +3,20 @@
    [lux "*"
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe]
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["[0]" state]]
     [data
      ["[0]" name]
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" monad)]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [macro
      ["[0]" code]]
     [math
@@ -31,11 +31,11 @@
    ["/[1]" // "_"
     ["[1][0]" extension]
     [//
-     ["/" analysis {"+" [Tag Analysis Operation Phase]}]
+     ["/" analysis {"+" Tag Analysis Operation Phase}]
      [///
       ["[1]" phase]
       [meta
-       [archive {"+" [Archive]}]]]]]])
+       [archive {"+" Archive}]]]]]])
 
 (exception: .public (invalid_variant_type [type Type
                                            tag Tag
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/type.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/type.lux
index 1f53c1154..ad467817c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/type.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/type.lux
@@ -2,17 +2,17 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" try]]
     [type
-     ["[0]" check {"+" [Check]}]]
+     ["[0]" check {"+" Check}]]
     ["[0]" meta]]]
   ["[0]" /// "_"
    ["[1][0]" extension]
    [//
-    ["/" analysis {"+" [Operation]}]
+    ["/" analysis {"+" Operation}]
     [///
      ["[1]" phase]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux
index 5622ab2dc..5dda23a74 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/directive.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" mix monoid)]]]]]
   ["[0]" // "_"
@@ -17,16 +17,16 @@
    ["[1][0]" analysis
     ["[1]/[0]" type]]
    ["/[1]" // "_"
-    ["/" directive {"+" [Phase]}]
+    ["/" directive {"+" Phase}]
     ["[1][0]" analysis
      ["[0]" evaluation]
-     ["[1]/[0]" macro {"+" [Expander]}]]
+     ["[1]/[0]" macro {"+" Expander}]]
     [///
      ["//" phase]
-     [reference {"+" []}
-      [variable {"+" []}]]
+     [reference {"+" }
+      [variable {"+" }]]
      [meta
-      [archive {"+" [Archive]}]]]]])
+      [archive {"+" Archive}]]]]])
 
 (exception: .public (not_a_directive [code Code])
   (exception.report
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux
index 19b2d94f9..02d8b32de 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension.lux
@@ -1,25 +1,25 @@
 (.module:
   [library
-   [lux {"-" [Name]}
+   [lux {"-" Name}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [hash {"+" [Hash]}]
-     ["[0]" monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [hash {"+" Hash}]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" order)
-      ["%" format {"+" [Format format]}]]
+      ["%" format {"+" Format format}]]
      [collection
       ["[0]" list]
-      ["[0]" dictionary {"+" [Dictionary]}]]]]]
+      ["[0]" dictionary {"+" Dictionary}]]]]]
   [/////
    ["//" phase]
    [meta
-    [archive {"+" [Archive]}]]])
+    [archive {"+" Archive}]]])
 
 (type: .public Name
   Text)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux
index 7cc98e804..1f06e07ef 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis.lux
@@ -5,8 +5,8 @@
      [collection
       ["[0]" dictionary]]]]]
   [////
-   [analysis {"+" [Bundle]}
-    [evaluation {"+" [Eval]}]]]
+   [analysis {"+" Bundle}
+    [evaluation {"+" Eval}]]]
   ["[0]" / "_"
    ["[1][0]" lux]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux
index 199bac7ce..b912758a3 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/common_lisp.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" ffi]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["<>" parser
-      ["<c>" code {"+" [Parser]}]]]
+      ["<c>" code {"+" Parser}]]]
     [data
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" dictionary]
       ["[0]" list]]]
     ["[0]" type
@@ -17,14 +17,14 @@
     ["@" target
      ["_" common_lisp]]]]
   [//
-   ["/" lux {"+" [custom]}]
+   ["/" lux {"+" custom}]
    [//
     ["[0]" bundle]
     [//
      ["[0]" analysis "_"
       ["[1]/[0]" type]]
      [//
-      ["[0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       [///
        ["[0]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
index 6de21c89b..a28eb1b0a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/js.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" ffi]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["<>" parser
-      ["<c>" code {"+" [Parser]}]]]
+      ["<c>" code {"+" Parser}]]]
     [data
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" dictionary]
       ["[0]" list]]]
     ["[0]" type
@@ -17,14 +17,14 @@
     ["@" target
      ["_" js]]]]
   [//
-   ["/" lux {"+" [custom]}]
+   ["/" lux {"+" custom}]
    [//
     ["[0]" bundle]
     [//
      ["[0]" analysis "_"
       ["[1]/[0]" type]]
      [//
-      ["[0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       [///
        ["[0]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index b19fc6e6e..b067a6953 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux {"-" [Type Module primitive type char int]}
-    ["[0]" ffi {"+" [import:]}]
+   [lux {"-" Type Module primitive type char int}
+    ["[0]" ffi {"+" import:}]
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      pipe
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]} ("[1]#[0]" monad)]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" try {"+" Try} ("[1]#[0]" monad)]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" code {"+" [Parser]}]
+      ["<[0]>" code {"+" Parser}]
       ["<[0]>" text]]]
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" mix monad monoid)]
       ["[0]" array]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [math
      [number
       ["n" nat]]]
@@ -28,20 +28,20 @@
      ["[0]" jvm "_"
       ["[0]!" reflection]
       [encoding
-       [name {"+" [External]}]]
-      ["[1]" type {"+" [Type Argument Typed]} ("[1]#[0]" equivalence)
-       ["[0]" category {"+" [Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method]}]
+       [name {"+" External}]]
+      ["[1]" type {"+" Type Argument Typed} ("[1]#[0]" equivalence)
+       ["[0]" category {"+" Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method}]
        ["[0]" box]
        ["[0]" reflection]
        ["[0]" descriptor]
        ["[0]" signature]
        ["[1]_[0]" parser]
-       ["[1]_[0]" alias {"+" [Aliasing]}]
-       ["[0]T" lux {"+" [Mapping]}]]]]
+       ["[1]_[0]" alias {"+" Aliasing}]
+       ["[0]T" lux {"+" Mapping}]]]]
     ["[0]" type
-     ["[0]" check {"+" [Check]} ("[1]#[0]" monad)]]]]
+     ["[0]" check {"+" Check} ("[1]#[0]" monad)]]]]
   ["[0]" // "_"
-   ["[1][0]" lux {"+" [custom]}]
+   ["[1][0]" lux {"+" custom}]
    ["/[1]" //
     ["[1][0]" bundle]
     ["/[1]" // "_"
@@ -50,13 +50,13 @@
       ["[0]A" inference]
       ["[0]" scope]]
      ["/[1]" // "_"
-      ["[1][0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[1][0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       ["[1][0]" synthesis]
       [///
        ["[0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}
-         [descriptor {"+" [Module]}]]]]]]]])
+        [archive {"+" Archive}
+         [descriptor {"+" Module}]]]]]]]])
 
 (import: java/lang/ClassLoader)
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
index beb9ac7c4..344fd831d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lua.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" ffi]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["<>" parser
-      ["<[0]>" code {"+" [Parser]}]]]
+      ["<[0]>" code {"+" Parser}]]]
     [data
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" dictionary]
       ["[0]" list]]]
     ["[0]" type
@@ -17,14 +17,14 @@
     ["@" target
      ["_" lua]]]]
   [//
-   ["/" lux {"+" [custom]}]
+   ["/" lux {"+" custom}]
    [//
     ["[0]" bundle]
     [//
      ["[0]" analysis "_"
       ["[1]/[0]" type]]
      [//
-      ["[0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       [///
        ["[0]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index 4b58b0bc1..cc629f53d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -2,19 +2,19 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe]
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" code {"+" [Parser]}]]]
+      ["<[0]>" code {"+" Parser}]]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [math
      [number
       ["n" nat]]]
@@ -27,12 +27,12 @@
     [analysis
      ["[0]A" type]]
     [//
-     ["[1][0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}
-      [evaluation {"+" [Eval]}]]
+     ["[1][0]" analysis {"+" Analysis Operation Phase Handler Bundle}
+      [evaluation {"+" Eval}]]
      [///
       ["[1]" phase]
       [meta
-       [archive {"+" [Archive]}]]]]]])
+       [archive {"+" Archive}]]]]]])
 
 (def: .public (custom [syntax handler])
   (All (_ s)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
index 0aa12b4be..f401d3aeb 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/php.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" ffi]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["<>" parser
-      ["<c>" code {"+" [Parser]}]]]
+      ["<c>" code {"+" Parser}]]]
     [data
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" dictionary]
       ["[0]" list]]]
     ["[0]" type
@@ -17,14 +17,14 @@
     ["@" target
      ["_" php]]]]
   [//
-   ["/" lux {"+" [custom]}]
+   ["/" lux {"+" custom}]
    [//
     ["[0]" bundle]
     [//
      ["[0]" analysis "_"
       ["[1]/[0]" type]]
      [//
-      ["[0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       [///
        ["[0]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
index 385150e03..a412c231e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/python.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" ffi]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["<>" parser
-      ["<[0]>" code {"+" [Parser]}]]]
+      ["<[0]>" code {"+" Parser}]]]
     [data
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" dictionary]
       ["[0]" list]]]
     ["[0]" type
@@ -17,14 +17,14 @@
     ["@" target
      ["_" python]]]]
   [//
-   ["/" lux {"+" [custom]}]
+   ["/" lux {"+" custom}]
    [//
     ["[0]" bundle]
     [//
      ["[0]" analysis "_"
       ["[1]/[0]" type]]
      [//
-      ["[0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       [///
        ["[0]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
index f0e6cb835..6cb0dfb58 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/r.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" ffi]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["<>" parser
-      ["<c>" code {"+" [Parser]}]]]
+      ["<c>" code {"+" Parser}]]]
     [data
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" dictionary]
       ["[0]" list]]]
     ["[0]" type
@@ -17,14 +17,14 @@
     ["@" target
      ["_" r]]]]
   [//
-   ["/" lux {"+" [custom]}]
+   ["/" lux {"+" custom}]
    [//
     ["[0]" bundle]
     [//
      ["[0]" analysis "_"
       ["[1]/[0]" type]]
      [//
-      ["[0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       [///
        ["[0]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
index 7a8eda597..54f02f43f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/ruby.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" ffi]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["<>" parser
-      ["<c>" code {"+" [Parser]}]]]
+      ["<c>" code {"+" Parser}]]]
     [data
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" dictionary]
       ["[0]" list]]]
     ["[0]" type
@@ -17,14 +17,14 @@
     ["@" target
      ["_" ruby]]]]
   [//
-   ["/" lux {"+" [custom]}]
+   ["/" lux {"+" custom}]
    [//
     ["[0]" bundle]
     [//
      ["[0]" analysis "_"
       ["[1]/[0]" type]]
      [//
-      ["[0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       [///
        ["[0]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
index 1dd6d0ca0..fdc770d45 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/scheme.lux
@@ -3,13 +3,13 @@
    [lux "*"
     ["[0]" ffi]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["<>" parser
-      ["<c>" code {"+" [Parser]}]]]
+      ["<c>" code {"+" Parser}]]]
     [data
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" dictionary]
       ["[0]" list]]]
     ["[0]" type
@@ -17,14 +17,14 @@
     ["@" target
      ["_" scheme]]]]
   [//
-   ["/" lux {"+" [custom]}]
+   ["/" lux {"+" custom}]
    [//
     ["[0]" bundle]
     [//
      ["[0]" analysis "_"
       ["[1]/[0]" type]]
      [//
-      ["[0]" analysis {"+" [Analysis Operation Phase Handler Bundle]}]
+      ["[0]" analysis {"+" Analysis Operation Phase Handler Bundle}]
       [///
        ["[0]" phase]]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux
index 49950f455..bc68affbb 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/bundle.lux
@@ -2,14 +2,14 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" dictionary {"+" [Dictionary]}]]]]]
-  [// {"+" [Handler Bundle]}])
+      ["[0]" dictionary {"+" Dictionary}]]]]]
+  [// {"+" Handler Bundle}])
 
 (def: .public empty
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
index c51113913..edf4eb749 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux {"-" [Type Definition]}
+   [lux {"-" Type Definition}
     ["[0]" host]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["<>" parser ("[1]#[0]" monad)
-      ["<c>" code {"+" [Parser]}]
+      ["<c>" code {"+" Parser}]
       ["<t>" text]]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" dictionary]
@@ -24,34 +24,34 @@
       ["[0]" i32]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
-      ["[0]" modifier {"+" [Modifier]} ("[1]#[0]" monoid)]
+      ["_" bytecode {"+" Bytecode}]
+      ["[0]" modifier {"+" Modifier} ("[1]#[0]" monoid)]
       ["[0]" attribute]
       ["[0]" field]
       ["[0]" version]
       ["[0]" class]
       ["[0]" constant
-       ["[0]" pool {"+" [Resource]}]]
+       ["[0]" pool {"+" Resource}]]
       [encoding
        ["[0]" name]]
-      ["[0]" type {"+" [Type Constraint Argument Typed]}
-       [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter]}]
-       ["[0]T" lux {"+" [Mapping]}]
+      ["[0]" type {"+" Type Constraint Argument Typed}
+       [category {"+" Void Value Return Method Primitive Object Class Array Var Parameter}]
+       ["[0]T" lux {"+" Mapping}]
        ["[0]" signature]
-       ["[0]" descriptor {"+" [Descriptor]}]
+       ["[0]" descriptor {"+" Descriptor}]
        ["[0]" parser]]]]
     [tool
      [compiler
       ["[0]" analysis]
       ["[0]" synthesis]
       ["[0]" generation]
-      ["[0]" directive {"+" [Handler Bundle]}]
+      ["[0]" directive {"+" Handler Bundle}]
       ["[0]" phase
        [analysis
         ["[0]A" type]]
        ["[0]" generation
         [jvm
-         [runtime {"+" [Anchor Definition]}]]]
+         [runtime {"+" Anchor Definition}]]]
        ["[0]" extension
         ["[0]" bundle]
         [analysis
@@ -59,7 +59,7 @@
         [directive
          ["/" lux]]]]]]
     [type
-     ["[0]" check {"+" [Check]}]]]])
+     ["[0]" check {"+" Check}]]]])
 
 (type: Operation
   (directive.Operation Anchor (Bytecode Any) Definition))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
index fdd576cdc..6cafe53ff 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
@@ -3,17 +3,17 @@
    [lux "*"
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     [io {"+" [IO]}]
+     [io {"+" IO}]
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" code {"+" [Parser]}]]]
+      ["<[0]>" code {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]]]
     [macro
@@ -21,9 +21,9 @@
     [math
      [number
       ["n" nat]]]
-    ["[0]" type {"+" [:sharing]}
+    ["[0]" type {"+" :sharing}
      ["[0]" check]]]]
-  ["[0]" /// {"+" [Extender]}
+  ["[0]" /// {"+" Extender}
    ["[1][0]" bundle]
    ["[1][0]" analysis]
    ["/[1]" // "_"
@@ -32,16 +32,16 @@
      ["[0]A" type]]
     ["/[1]" // "_"
      ["[1][0]" analysis
-      [macro {"+" [Expander]}]
+      [macro {"+" Expander}]
       ["[1]/[0]" evaluation]]
-     ["[1][0]" synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
-     ["[1][0]" directive {"+" [Import Requirements Phase Operation Handler Bundle]}]
-     ["[1][0]" program {"+" [Program]}]
+     ["[1][0]" synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
+     ["[1][0]" directive {"+" Import Requirements Phase Operation Handler Bundle}]
+     ["[1][0]" program {"+" Program}]
      [///
       ["[0]" phase]
       [meta
-       ["[0]" archive {"+" [Archive]}]]]]]])
+       ["[0]" archive {"+" Archive}]]]]]])
 
 (def: .public (custom [syntax handler])
   (All (_ anchor expression directive s)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
index 269dcfc5d..4c23cd11e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [common_lisp
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
index 44ed473ca..bdc1114ac 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/common.lux
@@ -2,16 +2,16 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" try]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" set]
@@ -20,20 +20,20 @@
      [number
       ["f" frac]]]
     ["@" target
-     ["_" common_lisp {"+" [Expression]}]]]]
+     ["_" common_lisp {"+" Expression}]]]]
   ["[0]" //// "_"
    ["/" bundle]
    ["/[1]" // "_"
     ["[0]" extension]
     [generation
-     [extension {"+" [Nullary Unary Binary Trinary
-                      nullary unary binary trinary]}]
+     [extension {"+" Nullary Unary Binary Trinary
+                 nullary unary binary trinary}]
      ["[0]" reference]
      ["//" common_lisp "_"
-      ["[1][0]" runtime {"+" [Operation Phase Handler Bundle Generator]}]
+      ["[1][0]" runtime {"+" Operation Phase Handler Bundle Generator}]
       ["[1][0]" case]]]
     [//
-     ["[0]" synthesis {"+" [%synthesis]}]
+     ["[0]" synthesis {"+" %synthesis}]
      ["[0]" generation]
      [///
       ["[1]" phase]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux
index 0fb66d830..f6411d1a6 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/common_lisp/host.lux
@@ -2,32 +2,32 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      [collection
       ["[0]" dictionary]
       ["[0]" list]]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
-     ["_" common_lisp {"+" [Var Expression]}]]]]
+     ["_" common_lisp {"+" Var Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" common {"+" [custom]}]
+   ["[1][0]" common {"+" custom}]
    ["//[1]" /// "_"
     ["/" bundle]
     ["/[1]" // "_"
      ["[0]" extension]
      [generation
-      [extension {"+" [Nullary Unary Binary Trinary
-                       nullary unary binary trinary]}]
+      [extension {"+" Nullary Unary Binary Trinary
+                  nullary unary binary trinary}]
       ["[0]" reference]
       ["//" common_lisp "_"
-       ["[1][0]" runtime {"+" [Operation Phase Handler Bundle
-                               with_vars]}]]]
+       ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+                          with_vars}]]]
      ["/[1]" // "_"
       ["[0]" generation]
       ["//[1]" /// "_"
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
index 967a2df34..0ba09e4f9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [js
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
index 036d12593..35b89e142 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
@@ -2,11 +2,11 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" try]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      [collection
@@ -16,16 +16,16 @@
      [number
       ["f" frac]]]
     ["@" target
-     ["_" js {"+" [Literal Expression Statement]}]]]]
+     ["_" js {"+" Literal Expression Statement}]]]]
   ["[0]" //// "_"
    ["/" bundle]
    ["/[1]" // "_"
     ["[0]" extension]
     [generation
-     [extension {"+" [Nullary Unary Binary Trinary
-                      nullary unary binary trinary]}]
+     [extension {"+" Nullary Unary Binary Trinary
+                 nullary unary binary trinary}]
      ["//" js "_"
-      ["[1][0]" runtime {"+" [Operation Phase Phase! Handler Bundle Generator]}]
+      ["[1][0]" runtime {"+" Operation Phase Phase! Handler Bundle Generator}]
       ["[1][0]" primitive]
       ["[1][0]" structure]
       ["[1][0]" reference]
@@ -33,8 +33,8 @@
       ["[1][0]" loop]
       ["[1][0]" function]]]
     [//
-     [analysis {"+" []}]
-     ["[0]" synthesis {"+" [%synthesis]}]
+     [analysis {"+" }]
+     ["[0]" synthesis {"+" %synthesis}]
      [///
       ["[1]" phase ("[1]#[0]" monad)]]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
index 8b587eb9d..8a83d334d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
@@ -2,29 +2,29 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      [collection
       ["[0]" dictionary]
       ["[0]" list]]]
     [target
-     ["_" js {"+" [Var Expression]}]]]]
+     ["_" js {"+" Var Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" common {"+" [custom]}]
+   ["[1][0]" common {"+" custom}]
    ["//[1]" /// "_"
     ["/" bundle]
     ["/[1]" // "_"
      ["[0]" extension]
      [generation
-      [extension {"+" [Nullary Unary Binary Trinary
-                       nullary unary binary trinary]}]
+      [extension {"+" Nullary Unary Binary Trinary
+                  nullary unary binary trinary}]
       ["//" js "_"
-       ["[1][0]" runtime {"+" [Operation Phase Handler Bundle
-                               with_vars]}]]]
+       ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+                          with_vars}]]]
      ["/[1]" // "_"
       ["[0]" generation]
       ["//[1]" /// "_"
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
index 77c0d6572..5ced6629d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [jvm
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
index c6116caa9..1f9b572e7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/common.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux {"-" [Type]}
+   [lux {"-" Type}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      [number
@@ -18,29 +18,29 @@
       ["[0]" dictionary]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Label Bytecode]} ("[1]#[0]" monad)]
+      ["_" bytecode {"+" Label Bytecode} ("[1]#[0]" monad)]
       [encoding
-       ["[0]" signed {"+" [S4]}]]
-      ["[0]" type {"+" [Type]}
-       [category {"+" [Primitive Class]}]]]]]]
+       ["[0]" signed {"+" S4}]]
+      ["[0]" type {"+" Type}
+       [category {"+" Primitive Class}]]]]]]
   ["[0]" ///// "_"
    [generation
-    [extension {"+" [Nullary Unary Binary Trinary Variadic
-                     nullary unary binary trinary variadic]}]
+    [extension {"+" Nullary Unary Binary Trinary Variadic
+                nullary unary binary trinary variadic}]
     ["///" jvm "_"
      ["[1][0]" value]
-     ["[1][0]" runtime {"+" [Operation Phase Bundle Handler]}]
+     ["[1][0]" runtime {"+" Operation Phase Bundle Handler}]
      ["[1][0]" function "_"
       ["[1]" abstract]]]]
    [extension
     ["[1]extension" /]
     ["[1][0]" bundle]]
    [//
-    ["/[1][0]" synthesis {"+" [Synthesis %synthesis]}]
+    ["/[1][0]" synthesis {"+" Synthesis %synthesis}]
     [///
      ["[1]" phase]
      [meta
-      [archive {"+" [Archive]}]]]]])
+      [archive {"+" Archive}]]]]])
 
 (def: .public (custom [parser handler])
   (All (_ s)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
index 6d55a284b..42809487f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux {"-" [Type]}
+   [lux {"-" Type}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe]
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
       ["<t>" text]
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [number
       ["[0]" i32]]
      [collection
       ["[0]" list ("[1]#[0]" monad)]
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" set]
       ["[0]" row]]
      ["[0]" format "_"
@@ -27,28 +27,28 @@
      [jvm
       ["[0]" version]
       ["[0]" modifier ("[1]#[0]" monoid)]
-      ["[0]" method {"+" [Method]}]
-      ["[0]" class {"+" [Class]}]
+      ["[0]" method {"+" Method}]
+      ["[0]" class {"+" Class}]
       [constant
-       [pool {"+" [Resource]}]]
+       [pool {"+" Resource}]]
       [encoding
        ["[0]" name]]
-      ["_" bytecode {"+" [Label Bytecode]} ("[1]#[0]" monad)
-       ["__" instruction {"+" [Primitive_Array_Type]}]]
-      ["[0]" type {"+" [Type Typed Argument]}
-       ["[0]" category {"+" [Void Value' Value Return' Return Primitive Object Array Var Parameter]}]
+      ["_" bytecode {"+" Label Bytecode} ("[1]#[0]" monad)
+       ["__" instruction {"+" Primitive_Array_Type}]]
+      ["[0]" type {"+" Type Typed Argument}
+       ["[0]" category {"+" Void Value' Value Return' Return Primitive Object Array Var Parameter}]
        ["[0]" box]
        ["[0]" reflection]
        ["[0]" signature]
        ["[0]" parser]]]]]]
   ["[0]" // "_"
-   [common {"+" [custom]}]
+   [common {"+" custom}]
    ["///[1]" //// "_"
     [generation
-     [extension {"+" [Nullary Unary Binary Trinary Variadic
-                      nullary unary binary trinary variadic]}]
+     [extension {"+" Nullary Unary Binary Trinary Variadic
+                 nullary unary binary trinary variadic}]
      ["///" jvm
-      ["[1][0]" runtime {"+" [Operation Bundle Phase Handler]}]
+      ["[1][0]" runtime {"+" Operation Bundle Phase Handler}]
       ["[1][0]" reference]
       [function
        [field
@@ -59,15 +59,15 @@
      [analysis
       ["/" jvm]]]
     ["/[1]" // "_"
-     [analysis {"+" [Environment]}]
-     ["[1][0]" synthesis {"+" [Synthesis Path %synthesis]}]
+     [analysis {"+" Environment}]
+     ["[1][0]" synthesis {"+" Synthesis Path %synthesis}]
      ["[1][0]" generation]
      [///
       ["[1]" phase]
       [reference
-       ["[1][0]" variable {"+" [Variable]}]]
+       ["[1][0]" variable {"+" Variable}]]
       [meta
-       ["[0]" archive {"+" [Archive]}]]]]]])
+       ["[0]" archive {"+" Archive}]]]]]])
 
 (template [<name> <0> <1>]
   [(def: <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
index 37a52ca08..711ca2a88 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [lua
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
index 005a2e7b9..7d7e431c1 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/common.lux
@@ -2,16 +2,16 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" try]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" list ("[1]#[0]" functor mix)]]]
@@ -19,16 +19,16 @@
      [number
       ["f" frac]]]
     ["@" target
-     ["_" lua {"+" [Expression Statement]}]]]]
+     ["_" lua {"+" Expression Statement}]]]]
   ["[0]" //// "_"
    ["/" bundle]
    ["/[1]" // "_"
     ["[0]" extension]
     [generation
-     [extension {"+" [Nullary Unary Binary Trinary
-                      nullary unary binary trinary]}]
+     [extension {"+" Nullary Unary Binary Trinary
+                 nullary unary binary trinary}]
      ["//" lua "_"
-      ["[1][0]" runtime {"+" [Operation Phase Phase! Handler Bundle Generator]}]
+      ["[1][0]" runtime {"+" Operation Phase Phase! Handler Bundle Generator}]
       ["[1][0]" primitive]
       ["[1][0]" structure]
       ["[1][0]" reference]
@@ -36,7 +36,7 @@
       ["[1][0]" loop]
       ["[1][0]" function]]]
     [//
-     ["[0]" synthesis {"+" [%synthesis]}]
+     ["[0]" synthesis {"+" %synthesis}]
      ["[0]" generation]
      [///
       ["[1]" phase ("[1]#[0]" monad)]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
index d23cb3fc4..2bcd95a66 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/lua/host.lux
@@ -2,32 +2,32 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      [collection
       ["[0]" dictionary]
       ["[0]" list]]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
-     ["_" lua {"+" [Var Expression]}]]]]
+     ["_" lua {"+" Var Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" common {"+" [custom]}]
+   ["[1][0]" common {"+" custom}]
    ["//[1]" /// "_"
     ["/" bundle]
     ["/[1]" // "_"
      ["[0]" extension]
      [generation
-      [extension {"+" [Nullary Unary Binary Trinary
-                       nullary unary binary trinary]}]
+      [extension {"+" Nullary Unary Binary Trinary
+                  nullary unary binary trinary}]
       ["[0]" reference]
       ["//" lua "_"
-       ["[1][0]" runtime {"+" [Operation Phase Handler Bundle
-                               with_vars]}]]]
+       ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+                          with_vars}]]]
      ["/[1]" // "_"
       ["[0]" generation]
       ["//[1]" /// "_"
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
index 1e07b97ce..a703f2a61 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [php
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
index 78f042591..b218eeb31 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/common.lux
@@ -2,16 +2,16 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" try]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" set]
@@ -20,20 +20,20 @@
      [number
       ["f" frac]]]
     ["@" target
-     ["_" php {"+" [Expression]}]]]]
+     ["_" php {"+" Expression}]]]]
   ["[0]" //// "_"
    ["/" bundle]
    ["/[1]" // "_"
     ["[0]" extension]
     [generation
-     [extension {"+" [Nullary Unary Binary Trinary
-                      nullary unary binary trinary]}]
+     [extension {"+" Nullary Unary Binary Trinary
+                 nullary unary binary trinary}]
      ["[0]" reference]
      ["//" php "_"
-      ["[1][0]" runtime {"+" [Operation Phase Handler Bundle Generator]}]
+      ["[1][0]" runtime {"+" Operation Phase Handler Bundle Generator}]
       ["[1][0]" case]]]
     [//
-     ["[0]" synthesis {"+" [%synthesis]}]
+     ["[0]" synthesis {"+" %synthesis}]
      ["[0]" generation]
      [///
       ["[1]" phase]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
index a73f7edf1..4b95fc0aa 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/php/host.lux
@@ -2,32 +2,32 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      [collection
       ["[0]" dictionary]
       ["[0]" list]]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
-     ["_" php {"+" [Var Expression]}]]]]
+     ["_" php {"+" Var Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" common {"+" [custom]}]
+   ["[1][0]" common {"+" custom}]
    ["//[1]" /// "_"
     ["/" bundle]
     ["/[1]" // "_"
      ["[0]" extension]
      [generation
-      [extension {"+" [Nullary Unary Binary Trinary
-                       nullary unary binary trinary]}]
+      [extension {"+" Nullary Unary Binary Trinary
+                  nullary unary binary trinary}]
       ["[0]" reference]
       ["//" php "_"
-       ["[1][0]" runtime {"+" [Operation Phase Handler Bundle
-                               with_vars]}]]]
+       ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+                          with_vars}]]]
      ["/[1]" // "_"
       ["[0]" generation]
       ["//[1]" /// "_"
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
index 54ab164b6..478b9bada 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [python
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
index 977ba36ee..e7c312c0a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/common.lux
@@ -2,16 +2,16 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" try]
      ["<>" parser
-      ["<[0]>" synthesis {"+" [Parser]}]]]
+      ["<[0]>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" list ("[1]#[0]" functor mix)]]]
@@ -19,17 +19,17 @@
      [number
       ["f" frac]]]
     [target
-     ["_" python {"+" [Expression Statement]}]]]]
+     ["_" python {"+" Expression Statement}]]]]
   ["[0]" //// "_"
    ["/" bundle]
    ["/[1]" // "_"
     ["[0]" extension]
     [generation
      ["[0]" reference]
-     [extension {"+" [Nullary Unary Binary Trinary
-                      nullary unary binary trinary]}]
+     [extension {"+" Nullary Unary Binary Trinary
+                 nullary unary binary trinary}]
      ["//" python "_"
-      ["[1][0]" runtime {"+" [Operation Phase Phase! Handler Bundle Generator]}]
+      ["[1][0]" runtime {"+" Operation Phase Phase! Handler Bundle Generator}]
       ["[1][0]" primitive]
       ["[1][0]" structure]
       ["[1][0]" reference]
@@ -37,8 +37,8 @@
       ["[1][0]" case]
       ["[1][0]" loop]]]
     [//
-     [analysis {"+" []}]
-     ["[0]" synthesis {"+" [%synthesis]}]
+     [analysis {"+" }]
+     ["[0]" synthesis {"+" %synthesis}]
      ["[0]" generation]
      [///
       ["[1]" phase ("[1]#[0]" monad)]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
index 8ad99da86..7c257467b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/python/host.lux
@@ -2,29 +2,29 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      [collection
       ["[0]" dictionary]
       ["[0]" list]]]
     [target
-     ["_" python {"+" [Expression SVar]}]]]]
+     ["_" python {"+" Expression SVar}]]]]
   ["[0]" // "_"
-   ["[1][0]" common {"+" [custom]}]
+   ["[1][0]" common {"+" custom}]
    ["//[1]" /// "_"
     ["/" bundle]
     ["/[1]" // "_"
      ["[0]" extension]
      [generation
-      [extension {"+" [Nullary Unary Binary Trinary
-                       nullary unary binary trinary]}]
+      [extension {"+" Nullary Unary Binary Trinary
+                  nullary unary binary trinary}]
       ["//" python "_"
-       ["[1][0]" runtime {"+" [Operation Phase Handler Bundle
-                               with_vars]}]]]
+       ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+                          with_vars}]]]
      ["/[1]" // "_"
       ["[0]" generation]
       ["//[1]" /// "_"
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
index 56a20b22c..6e204dac2 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [r
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
index 5e882b8a2..854ad42bc 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/common.lux
@@ -2,16 +2,16 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" try]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" set]
@@ -20,20 +20,20 @@
      [number
       ["f" frac]]]
     ["@" target
-     ["_" r {"+" [Expression]}]]]]
+     ["_" r {"+" Expression}]]]]
   ["[0]" //// "_"
    ["/" bundle]
    ["/[1]" // "_"
     ["[0]" extension]
     [generation
-     [extension {"+" [Nullary Unary Binary Trinary
-                      nullary unary binary trinary]}]
+     [extension {"+" Nullary Unary Binary Trinary
+                 nullary unary binary trinary}]
      ["[0]" reference]
      ["//" r "_"
-      ["[1][0]" runtime {"+" [Operation Phase Handler Bundle Generator]}]
+      ["[1][0]" runtime {"+" Operation Phase Handler Bundle Generator}]
       ["[1][0]" case]]]
     [//
-     ["[0]" synthesis {"+" [%synthesis]}]
+     ["[0]" synthesis {"+" %synthesis}]
      ["[0]" generation]
      [///
       ["[1]" phase]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux
index 38b20cb41..91301bde6 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/r/host.lux
@@ -2,32 +2,32 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      [collection
       ["[0]" dictionary]
       ["[0]" list]]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
-     ["_" r {"+" [Var Expression]}]]]]
+     ["_" r {"+" Var Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" common {"+" [custom]}]
+   ["[1][0]" common {"+" custom}]
    ["//[1]" /// "_"
     ["/" bundle]
     ["/[1]" // "_"
      ["[0]" extension]
      [generation
-      [extension {"+" [Nullary Unary Binary Trinary
-                       nullary unary binary trinary]}]
+      [extension {"+" Nullary Unary Binary Trinary
+                  nullary unary binary trinary}]
       ["[0]" reference]
       ["//" r "_"
-       ["[1][0]" runtime {"+" [Operation Phase Handler Bundle
-                               with_vars]}]]]
+       ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+                          with_vars}]]]
      ["/[1]" // "_"
       ["[0]" generation]
       ["//[1]" /// "_"
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
index 5c4160d69..03dafeb6b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [ruby
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
index 29291e8b8..607320bbb 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/common.lux
@@ -2,16 +2,16 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" try]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" list ("[1]#[0]" functor mix)]]]
@@ -19,16 +19,16 @@
      [number
       ["f" frac]]]
     [target
-     ["_" ruby {"+" [Expression Statement]}]]]]
+     ["_" ruby {"+" Expression Statement}]]]]
   ["[0]" //// "_"
    ["/" bundle]
    ["/[1]" // "_"
     ["[0]" extension]
     [generation
-     [extension {"+" [Nullary Unary Binary Trinary
-                      nullary unary binary trinary]}]
+     [extension {"+" Nullary Unary Binary Trinary
+                 nullary unary binary trinary}]
      ["//" ruby "_"
-      ["[1][0]" runtime {"+" [Operation Phase Phase! Handler Bundle Generator]}]
+      ["[1][0]" runtime {"+" Operation Phase Phase! Handler Bundle Generator}]
       ["[1][0]" primitive]
       ["[1][0]" structure]
       ["[1][0]" reference]
@@ -36,7 +36,7 @@
       ["[1][0]" case]
       ["[1][0]" loop]]]
     [//
-     ["[0]" synthesis {"+" [%synthesis]}]
+     ["[0]" synthesis {"+" %synthesis}]
      ["[0]" generation]
      [///
       ["[1]" phase ("[1]#[0]" monad)]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
index 21be2a847..4d4b262e9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/ruby/host.lux
@@ -2,32 +2,32 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      [collection
       ["[0]" dictionary]
       ["[0]" list]]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
-     ["_" ruby {"+" [Var Expression]}]]]]
+     ["_" ruby {"+" Var Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" common {"+" [custom]}]
+   ["[1][0]" common {"+" custom}]
    ["//[1]" /// "_"
     ["/" bundle]
     ["/[1]" // "_"
      ["[0]" extension]
      [generation
-      [extension {"+" [Nullary Unary Binary Trinary
-                       nullary unary binary trinary]}]
+      [extension {"+" Nullary Unary Binary Trinary
+                  nullary unary binary trinary}]
       ["[0]" reference]
       ["//" ruby "_"
-       ["[1][0]" runtime {"+" [Operation Phase Handler Bundle
-                               with_vars]}]]]
+       ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+                          with_vars}]]]
      ["/[1]" // "_"
       ["[0]" generation]
       ["//[1]" /// "_"
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
index 52cafa261..055cd9e03 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme.lux
@@ -10,7 +10,7 @@
    [////
     [generation
      [scheme
-      [runtime {"+" [Bundle]}]]]]])
+      [runtime {"+" Bundle}]]]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
index a8f4f1bb7..d22c8d075 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/common.lux
@@ -2,16 +2,16 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" try]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" set]
@@ -20,20 +20,20 @@
      [number
       ["f" frac]]]
     ["@" target
-     ["_" scheme {"+" [Expression]}]]]]
+     ["_" scheme {"+" Expression}]]]]
   ["[0]" //// "_"
    ["/" bundle]
    ["/[1]" // "_"
     ["[0]" extension]
     [generation
-     [extension {"+" [Nullary Unary Binary Trinary
-                      nullary unary binary trinary]}]
+     [extension {"+" Nullary Unary Binary Trinary
+                 nullary unary binary trinary}]
      ["[0]" reference]
      ["//" scheme "_"
-      ["[1][0]" runtime {"+" [Operation Phase Handler Bundle Generator]}]
+      ["[1][0]" runtime {"+" Operation Phase Handler Bundle Generator}]
       ["[1][0]" case]]]
     [//
-     ["[0]" synthesis {"+" [%synthesis]}]
+     ["[0]" synthesis {"+" %synthesis}]
      ["[0]" generation]
      [///
       ["[1]" phase]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
index b389f72dd..e648f9934 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/scheme/host.lux
@@ -2,32 +2,32 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      [collection
       ["[0]" dictionary]
       ["[0]" list]]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
-     ["_" scheme {"+" [Var Expression]}]]]]
+     ["_" scheme {"+" Var Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" common {"+" [custom]}]
+   ["[1][0]" common {"+" custom}]
    ["//[1]" /// "_"
     ["/" bundle]
     ["/[1]" // "_"
      ["[0]" extension]
      [generation
-      [extension {"+" [Nullary Unary Binary Trinary
-                       nullary unary binary trinary]}]
+      [extension {"+" Nullary Unary Binary Trinary
+                  nullary unary binary trinary}]
       ["[0]" reference]
       ["//" scheme "_"
-       ["[1][0]" runtime {"+" [Operation Phase Handler Bundle
-                               with_vars]}]]]
+       ["[1][0]" runtime {"+" Operation Phase Handler Bundle
+                          with_vars}]]]
      ["/[1]" // "_"
       ["[0]" generation]
       ["//[1]" /// "_"
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux
index e68f8b780..ce3098d6c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/synthesis.lux
@@ -4,7 +4,7 @@
   [//
    ["[0]" bundle]
    [///
-    [synthesis {"+" [Bundle]}]]])
+    [synthesis {"+" Bundle}]]])
 
 (def: .public bundle
   Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
index f8ed7195d..1f4312482 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]]]
+     [monad {"+" do}]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase]}]
+   [runtime {"+" Phase}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
@@ -16,12 +16,12 @@
     ["/[1]" // "_"
      ["[1][0]" extension]
      ["/[1]" // "_"
-      [analysis {"+" []}]
+      [analysis {"+" }]
       ["[1][0]" synthesis]
       ["//[1]" /// "_"
        ["[1][0]" phase ("[1]#[0]" monad)]
-       [reference {"+" []}
-        [variable {"+" []}]]]]]]])
+       [reference {"+"}
+        [variable {"+"}]]]]]]])
 
 (def: .public (generate archive synthesis)
   Phase
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
index 28bcf92fa..215ce0d05 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/case.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux {"-" [case let if]}
+   [lux {"-" case let if}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix monoid)]
       ["[0]" set]]]
@@ -15,9 +15,9 @@
      [number
       ["n" nat]]]
     [target
-     ["_" common_lisp {"+" [Expression Var/1]}]]]]
+     ["_" common_lisp {"+" Expression Var/1}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" reference]
    ["[1][0]" primitive]
    ["/[1]" // "_"
@@ -26,14 +26,14 @@
      ["[1][0]" synthesis "_"
       ["[1]/[0]" case]]
      ["/[1]" // "_"
-      ["[1][0]" synthesis {"+" [Member Synthesis Path]}]
+      ["[1][0]" synthesis {"+" Member Synthesis Path}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        [reference
-        ["[1][0]" variable {"+" [Register]}]]
+        ["[1][0]" variable {"+" Register}]]
        ["[1][0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}]]]]]]])
+        [archive {"+" Archive}]]]]]]])
 
 (def: .public register
   (-> Register Var/1)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux
index ebdd43f89..359031ab8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension.lux
@@ -5,7 +5,7 @@
      [collection
       ["[0]" dictionary]]]]]
   [//
-   [runtime {"+" [Bundle]}]]
+   [runtime {"+" Bundle}]]
   [/
    ["[0]" common]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
index 6144a74c6..72075b5a6 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/extension/common.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]]
     [data
@@ -12,13 +12,13 @@
      [collection
       ["[0]" dictionary]]]
     [target
-     ["_" common_lisp {"+" [Expression]}]]]]
+     ["_" common_lisp {"+" Expression}]]]]
   ["[0]" /// "_"
-   ["[1][0]" runtime {"+" [Operation Phase Handler Bundle]}]
+   ["[1][0]" runtime {"+" Operation Phase Handler Bundle}]
    ["[1][0]" primitive]
    [//
-    [extension {"+" [Nullary Unary Binary Trinary
-                     nullary unary binary trinary]}]
+    [extension {"+" Nullary Unary Binary Trinary
+                nullary unary binary trinary}]
     [//
      [extension
       ["[0]" bundle]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux
index 23c245a1e..9c585b13b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/function.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux {"-" [function]}
+   [lux {"-" function}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      pipe]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [target
-     ["_" common_lisp {"+" [Expression Var/1]}]]]]
+     ["_" common_lisp {"+" Expression Var/1}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" reference]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     [analysis {"+" [Variant Tuple Abstraction Application Analysis]}]
-     [synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
+     [analysis {"+" Variant Tuple Abstraction Application Analysis}]
+     [synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
      ["//[1]" /// "_"
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[1][0]" phase ("[1]#[0]" monad)]
       [reference
-       [variable {"+" [Register Variable]}]]]]]])
+       [variable {"+" Register Variable}]]]]]])
 
 (def: .public (apply expression archive [functionS argsS+])
   (Generator (Application Synthesis))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux
index d6c8ac457..04b30cb45 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/loop.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux {"-" [Scope]}
+   [lux {"-" Scope}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
      [number
       ["n" nat]]]
     [target
-     ["_" common_lisp {"+" [Expression]}]]]]
+     ["_" common_lisp {"+" Expression}]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Generator]}]
+   [runtime {"+" Operation Phase Generator}]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
@@ -23,14 +23,14 @@
      [synthesis
       ["[0]" case]]
      ["/[1]" // "_"
-      ["[0]"synthesis {"+" [Scope Synthesis]}]
+      ["[0]"synthesis {"+" Scope Synthesis}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        ["[1][0]" phase]
        [meta
-        [archive {"+" [Archive]}]]
+        [archive {"+" Archive}]]
        [reference
-        [variable {"+" [Register]}]]]]]]])
+        [variable {"+" Register}]]]]]]])
 
 (def: .public (scope expression archive [start initsS+ bodyS])
   (Generator (Scope Synthesis))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux
index 33c46df80..e9f0ae6b9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/primitive.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     [target
-     ["_" common_lisp {"+" [Expression]}]]]])
+     ["_" common_lisp {"+" Expression}]]]])
 
 (def: .public bit
   (-> Bit (Expression Any))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux
index d7ecb7abd..ec7033213 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/reference.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [target
-     ["_" common_lisp {"+" [Expression]}]]]]
+     ["_" common_lisp {"+" Expression}]]]]
   [///
-   [reference {"+" [System]}]])
+   [reference {"+" System}]])
 
 (implementation: .public system
   (System (Expression Any))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
index 2699124bd..8180b15b0 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [Location]}
+   [lux {"-" Location}
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
@@ -11,32 +11,32 @@
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       ["[0]" encoding]]
      [collection
       ["[0]" list ("[1]#[0]" functor monoid)]
       ["[0]" row]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["[0]" i64]]]
     ["@" target
-     ["_" common_lisp {"+" [Expression Computation Literal]}]]]]
+     ["_" common_lisp {"+" Expression Computation Literal}]]]]
   ["[0]" /// "_"
    ["[1][0]" reference]
    ["//[1]" /// "_"
-    [analysis {"+" [Variant]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["[1][0]" generation]
     ["//[1]" ///
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]
+      [variable {"+" Register}]]
      [meta
-      [archive {"+" [Output Archive]}
-       ["[0]" artifact {"+" [Registry]}]]]]]])
+      [archive {"+" Output Archive}
+       ["[0]" artifact {"+" Registry}]]]]]])
 
 (def: module_id
   0)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux
index 36d5ad914..ac1085b1f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/structure.lux
@@ -2,15 +2,15 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [target
-     ["_" common_lisp {"+" [Expression]}]]]]
+     ["_" common_lisp {"+" Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["//[1]" /// "_"
      ["[1][0]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
index b08634e0c..686e9934e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      [parser
       ["<[0]>" code]]]
@@ -10,13 +10,13 @@
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     ["[0]" meta]
-    ["[0]" macro {"+" [with_identifiers]}
+    ["[0]" macro {"+" with_identifiers}
      ["[0]" code]
-     [syntax {"+" [syntax:]}]]]]
+     [syntax {"+" syntax:}]]]]
   ["[0]" /// "_"
    ["[1][0]" extension]
    [//
-    [synthesis {"+" [Synthesis]}]
+    [synthesis {"+" Synthesis}]
     ["[0]" generation]
     [///
      ["[1]" phase]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux
index 1656d87a1..2acd26bd7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [target
      ["_" js]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase Phase!]}]
+   [runtime {"+" Phase Phase!}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
@@ -23,12 +23,12 @@
        [js
         ["[1]/[0]" common]]]]
      ["/[1]" // "_"
-      [analysis {"+" []}]
+      [analysis {"+" }]
       ["[0]" synthesis]
       ["//[1]" /// "_"
        ["[1][0]" phase ("[1]#[0]" monad)]
-       [reference {"+" []}
-        [variable {"+" []}]]]]]]])
+       [reference {"+"}
+        [variable {"+"}]]]]]]])
 
 (exception: .public cannot_recur_as_an_expression)
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
index e778a040e..f23a1a152 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [case let if]}
+   [lux {"-" case let if}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe]]
     [data
@@ -13,9 +13,9 @@
      [number
       ["n" nat]]]
     [target
-     ["_" js {"+" [Expression Computation Var Statement]}]]]]
+     ["_" js {"+" Expression Computation Var Statement}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Phase! Generator Generator!]}]
+   ["[1][0]" runtime {"+" Operation Phase Phase! Generator Generator!}]
    ["[1][0]" reference]
    ["[1][0]" primitive]
    ["/[1]" // "_"
@@ -24,13 +24,13 @@
      ["[1][0]" synthesis "_"
       ["[1]/[0]" case]]
      ["/[1]" // "_"
-      ["[1][0]" synthesis {"+" [Member Synthesis Path]}]
+      ["[1][0]" synthesis {"+" Member Synthesis Path}]
       ["//[1]" /// "_"
        [reference
-        [variable {"+" [Register]}]]
+        [variable {"+" Register}]]
        ["[1][0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}]]]]]]])
+        [archive {"+" Archive}]]]]]]])
 
 (def: .public register
   (-> Register Var)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
index 6e6ec5f9f..add23e343 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
@@ -1,31 +1,31 @@
 (.module:
   [library
-   [lux {"-" [Variant Tuple function]}
+   [lux {"-" Variant Tuple function}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [target
-     ["_" js {"+" [Expression Computation Var Statement]}]]]]
+     ["_" js {"+" Expression Computation Var Statement}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Phase! Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Phase! Generator}]
    ["[1][0]" reference]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     [analysis {"+" [Variant Tuple Abstraction Application Analysis]}]
-     [synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
+     [analysis {"+" Variant Tuple Abstraction Application Analysis}]
+     [synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
      ["//[1]" /// "_"
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[1][0]" phase ("[1]#[0]" monad)]
       [reference
-       [variable {"+" [Register Variable]}]]]]]])
+       [variable {"+" Register Variable}]]]]]])
 
 (def: .public (apply expression archive [functionS argsS+])
   (Generator (Application Synthesis))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
index ab90d7193..725f08062 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
@@ -1,29 +1,29 @@
 (.module:
   [library
-   [lux {"-" [Scope]}
+   [lux {"-" Scope}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [math
      [number
       ["n" nat]]]
     [target
-     ["_" js {"+" [Computation Var Expression Statement]}]]]]
+     ["_" js {"+" Computation Var Expression Statement}]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Phase! Generator Generator!]}]
+   [runtime {"+" Operation Phase Phase! Generator Generator!}]
    ["[1][0]" case]
    ["///[1]" //// "_"
-    [synthesis {"+" [Scope Synthesis]}]
+    [synthesis {"+" Scope Synthesis}]
     ["[1][0]" generation]
     ["//[1]" /// "_"
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]]]])
+      [variable {"+" Register}]]]]])
 
 (def: @scope
   (-> Nat Text)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux
index e8145500a..c9f0d2c25 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/primitive.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     [target
-     ["_" js {"+" [Computation]}]]]]
+     ["_" js {"+" Computation}]]]]
   ["[0]" // "_"
    ["[1][0]" runtime]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux
index c2bf71750..e41e18aed 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/reference.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [target
-     ["_" js {"+" [Expression]}]]]]
+     ["_" js {"+" Expression}]]]]
   [///
-   [reference {"+" [System]}]])
+   [reference {"+" System}]])
 
 (implementation: .public system
   (System Expression)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
index b1ad89c64..e93f01032 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
@@ -11,20 +11,20 @@
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["[0]" i64]]]
     [target
-     ["_" js {"+" [Expression Var Computation Statement]}]]
+     ["_" js {"+" Expression Var Computation Statement}]]
     [tool
      [compiler
       [language
@@ -33,15 +33,15 @@
   ["[0]" /// "_"
    ["[1][0]" reference]
    ["//[1]" /// "_"
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["[1][0]" generation]
     ["//[1]" ///
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]
+      [variable {"+" Register}]]
      [meta
-      [archive {"+" [Output Archive]}
-       ["[0]" artifact {"+" [Registry]}]]]]]])
+      [archive {"+" Output Archive}
+       ["[0]" artifact {"+" Registry}]]]]]])
 
 (template [<name> <base>]
   [(type: .public <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux
index dc13bc56c..11f3d095e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/structure.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux {"-" [Variant Tuple]}
+   [lux {"-" Variant Tuple}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [target
-     ["_" js {"+" [Expression]}]]]]
+     ["_" js {"+" Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["//[1]" ///
      ["[1][0]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux
index 638ba9d80..c6fb592ea 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]]]
+     [monad {"+" do}]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase]}]
+   [runtime {"+" Phase}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
index ff82db88e..45898904f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/case.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [Type if let case int]}
+   [lux {"-" Type if let case int}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]]
     [data
@@ -13,21 +13,21 @@
       ["[0]" list ("[1]#[0]" mix)]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Label Bytecode]} ("[1]#[0]" monad)]
-      ["[0]" type {"+" [Type]}
-       [category {"+" [Method]}]]]]]]
+      ["_" bytecode {"+" Label Bytecode} ("[1]#[0]" monad)]
+      ["[0]" type {"+" Type}
+       [category {"+" Method}]]]]]]
   ["[0]" // "_"
    ["[1][0]" type]
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" value]
    ["[1][0]" structure]
    [////
-    ["[0]" synthesis {"+" [Path Synthesis]}]
+    ["[0]" synthesis {"+" Path Synthesis}]
     ["[0]" generation]
     [///
      ["[0]" phase ("operation#[0]" monad)]
      [reference
-      [variable {"+" [Register]}]]]]])
+      [variable {"+" Register}]]]]])
 
 (def: equals_name
   "equals")
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux
index 9e6328388..0efa979a0 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/debug.lux
@@ -2,16 +2,16 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" io {"+" [IO]}]
-     ["[0]" try {"+" [Try]}]]
+     ["[0]" io {"+" IO}]
+     ["[0]" try {"+" Try}]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [world
-     ["[0]" file {"+" [File]}]]]])
+     ["[0]" file {"+" File}]]]])
 
 (def: extension ".class")
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
index f7556b075..468ddd17b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [Type]}
+   [lux {"-" Type}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      [number
       ["[0]" i32]
@@ -15,23 +15,23 @@
     [target
      [jvm
       ["[0]" version]
-      ["[0]" modifier {"+" [Modifier]} ("[1]#[0]" monoid)]
-      ["[0]" field {"+" [Field]}]
-      ["[0]" method {"+" [Method]}]
-      ["_" bytecode {"+" [Label Bytecode]} ("[1]#[0]" monad)]
-      ["[0]" class {"+" [Class]}]
-      ["[0]" type {"+" [Type]}
-       [category {"+" [Return' Value']}]
+      ["[0]" modifier {"+" Modifier} ("[1]#[0]" monoid)]
+      ["[0]" field {"+" Field}]
+      ["[0]" method {"+" Method}]
+      ["_" bytecode {"+" Label Bytecode} ("[1]#[0]" monad)]
+      ["[0]" class {"+" Class}]
+      ["[0]" type {"+" Type}
+       [category {"+" Return' Value'}]
        ["[0]" reflection]]
       ["[0]" constant
-       [pool {"+" [Resource]}]]
+       [pool {"+" Resource}]]
       [encoding
-       ["[0]" name {"+" [External Internal]}]
+       ["[0]" name {"+" External Internal}]
        ["[0]" unsigned]]]]
     [tool
      [compiler
       [meta
-       ["[0]" archive {"+" [Archive]}]]]]]]
+       ["[0]" archive {"+" Archive}]]]]]]
   ["[0]" / "_"
    ["[1][0]" abstract]
    [field
@@ -47,16 +47,16 @@
     ["[1][0]" reset]
     ["[1][0]" apply]]
    ["/[1]" // "_"
-    ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+    ["[1][0]" runtime {"+" Operation Phase Generator}]
     [////
-     [analysis {"+" [Environment]}]
-     [synthesis {"+" [Synthesis Abstraction Apply]}]
+     [analysis {"+" Environment}]
+     [synthesis {"+" Synthesis Abstraction Apply}]
      ["[0]" generation]
      [///
-      ["[0]" arity {"+" [Arity]}]
+      ["[0]" arity {"+" Arity}]
       ["[0]" phase]
       [reference
-       [variable {"+" [Register]}]]]]]])
+       [variable {"+" Register}]]]]]])
 
 (def: .public (with generate archive @begin class environment arity body)
   (-> Phase Archive Label External (Environment Synthesis) Arity (Bytecode Any)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux
index 50f29310f..57c1a4a7a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/abstract.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux {"-" [Type]}
+   [lux {"-" Type}
     [data
      [text
       ["%" format]]]
     [target
      [jvm
-      ["[0]" type {"+" [Type]}
-       [category {"+" [Method]}]]]]]]
+      ["[0]" type {"+" Type}
+       [category {"+" Method}]]]]]]
   [//
    [field
     [constant
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux
index f902f8b83..0bb37e3da 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux {"-" [Type type]}
+   [lux {"-" Type type}
     [data
      [collection
       ["[0]" row]]]
     [target
      [jvm
-      ["[0]" field {"+" [Field]}]
-      ["[0]" modifier {"+" [Modifier]} ("[1]#[0]" monoid)]
-      [type {"+" [Type]}
-       [category {"+" [Value]}]]
+      ["[0]" field {"+" Field}]
+      ["[0]" modifier {"+" Modifier} ("[1]#[0]" monoid)]
+      [type {"+" Type}
+       [category {"+" Value}]]
       [constant
-       [pool {"+" [Resource]}]]]]]])
+       [pool {"+" Resource}]]]]]])
 
 (def: modifier
   (Modifier Field)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux
index ede38774c..dc98896ce 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/constant/arity.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux {"-" [type]}
+   [lux {"-" type}
     [target
      [jvm
       ["[0]" type]
-      ["[0]" field {"+" [Field]}]
+      ["[0]" field {"+" Field}]
       [constant
-       [pool {"+" [Resource]}]]]]]]
+       [pool {"+" Resource}]]]]]]
   ["[0]" //
    [/////////
-    [arity {"+" [Arity]}]]])
+    [arity {"+" Arity}]]])
 
 (def: .public name "arity")
 (def: .public type type.int)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
index 7f5969f7b..9365336e8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable.lux
@@ -1,25 +1,25 @@
 (.module:
   [library
-   [lux {"-" [Type type]}
+   [lux {"-" Type type}
     [data
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]]
     [target
      [jvm
-      ["[0]" modifier {"+" [Modifier]} ("[1]#[0]" monoid)]
-      ["[0]" field {"+" [Field]}]
-      ["_" bytecode {"+" [Bytecode]}]
-      [type {"+" [Type]}
-       [category {"+" [Value Class]}]]
+      ["[0]" modifier {"+" Modifier} ("[1]#[0]" monoid)]
+      ["[0]" field {"+" Field}]
+      ["_" bytecode {"+" Bytecode}]
+      [type {"+" Type}
+       [category {"+" Value Class}]]
       [constant
-       [pool {"+" [Resource]}]]]]]]
+       [pool {"+" Resource}]]]]]]
   ["[0]" //// "_"
    ["[1][0]" type]
    ["[1][0]" reference]
    [//////
     [reference
-     [variable {"+" [Register]}]]]])
+     [variable {"+" Register}]]]])
 
 (def: .public type ////type.value)
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux
index c21896ac9..7240ff13f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/count.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux {"-" [type]}
+   [lux {"-" type}
     [control
      ["[0]" try]]
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
+      ["_" bytecode {"+" Bytecode}]
       ["[0]" type]
       [encoding
-       [name {"+" [External]}]
+       [name {"+" External}]
        ["[0]" signed]]]]]]
   ["[0]" //// "_"
    ["[1][0]" abstract]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux
index f1f03af6c..747d53f66 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/foreign.lux
@@ -1,27 +1,27 @@
 (.module:
   [library
-   [lux {"-" [Type]}
+   [lux {"-" Type}
     [data
      [collection
       ["[0]" list]
       ["[0]" row]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
-      ["[0]" field {"+" [Field]}]
+      ["_" bytecode {"+" Bytecode}]
+      ["[0]" field {"+" Field}]
       [constant
-       [pool {"+" [Resource]}]]
-      [type {"+" [Type]}
-       [category {"+" [Value Class]}]]]]]]
+       [pool {"+" Resource}]]
+      [type {"+" Type}
+       [category {"+" Value Class}]]]]]]
   ["[0]" //
    ["///[1]" //// "_"
     ["[1][0]" reference]
     [////
-     [analysis {"+" [Environment]}]
-     [synthesis {"+" [Synthesis]}]
+     [analysis {"+" Environment}]
+     [synthesis {"+" Synthesis}]
      [///
       [reference
-       [variable {"+" [Register]}]]]]]])
+       [variable {"+" Register}]]]]]])
 
 (def: .public (closure environment)
   (-> (Environment Synthesis) (List (Type Value)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
index 67adbe6fb..216c8cba8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/field/variable/partial.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" [Type]}
+   [lux {"-" Type}
     [abstract
      ["[0]" monad]]
     [data
@@ -11,12 +11,12 @@
       ["[0]" row]]]
     [target
      [jvm
-      ["[0]" field {"+" [Field]}]
-      ["_" bytecode {"+" [Label Bytecode]} ("[1]#[0]" monad)]
-      [type {"+" [Type]}
-       [category {"+" [Class]}]]
+      ["[0]" field {"+" Field}]
+      ["_" bytecode {"+" Label Bytecode} ("[1]#[0]" monad)]
+      [type {"+" Type}
+       [category {"+" Class}]]
       [constant
-       [pool {"+" [Resource]}]]]]]]
+       [pool {"+" Resource}]]]]]]
   ["[0]" / "_"
    ["[1][0]" count]
    ["/[1]" //
@@ -26,9 +26,9 @@
      ["//[1]" /// "_"
       ["[1][0]" reference]
       [//////
-       ["[0]" arity {"+" [Arity]}]
+       ["[0]" arity {"+" Arity}]
        [reference
-        [variable {"+" [Register]}]]]]]]])
+        [variable {"+" Register}]]]]]]])
 
 (def: .public (initial amount)
   (-> Nat (Bytecode Any))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux
index fcf965365..13adbc953 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method.lux
@@ -3,8 +3,8 @@
    [lux "*"
     [target
      [jvm
-      ["[0]" modifier {"+" [Modifier]} ("[1]#[0]" monoid)]
-      ["[0]" method {"+" [Method]}]]]]])
+      ["[0]" modifier {"+" Modifier} ("[1]#[0]" monoid)]
+      ["[0]" method {"+" Method}]]]]])
 
 (def: .public modifier
   (Modifier Method)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
index de389d38f..93659cad4 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/apply.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [Type type]}
+   [lux {"-" Type type}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" try]]
     [data
@@ -14,14 +14,14 @@
       ["[0]" list ("[1]#[0]" monoid functor)]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Label Bytecode]} ("[1]#[0]" monad)]
-      ["[0]" method {"+" [Method]}]
+      ["_" bytecode {"+" Label Bytecode} ("[1]#[0]" monad)]
+      ["[0]" method {"+" Method}]
       [constant
-       [pool {"+" [Resource]}]]
+       [pool {"+" Resource}]]
       [encoding
        ["[0]" signed]]
-      ["[0]" type {"+" [Type]}
-       ["[0]" category {"+" [Class]}]]]]]]
+      ["[0]" type {"+" Type}
+       ["[0]" category {"+" Class}]]]]]]
   ["[0]" //
    ["[1][0]" reset]
    ["[1][0]" implementation]
@@ -40,12 +40,12 @@
      ["[1][0]" value]
      ["[1][0]" reference]
      [////
-      [analysis {"+" [Environment]}]
-      [synthesis {"+" [Synthesis]}]
+      [analysis {"+" Environment}]
+      [synthesis {"+" Synthesis}]
       [///
-       [arity {"+" [Arity]}]
+       [arity {"+" Arity}]
        [reference
-        [variable {"+" [Register]}]]]]]]])
+        [variable {"+" Register}]]]]]]])
 
 (def: (increment by)
   (-> Nat (Bytecode Any))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
index 9a77e6a62..d031faf07 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/implementation.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux {"-" [Type type]}
+   [lux {"-" Type type}
     [data
      [collection
       ["[0]" list]]]
     [target
      [jvm
-      ["[0]" method {"+" [Method]}]
-      ["_" bytecode {"+" [Label Bytecode]}]
+      ["[0]" method {"+" Method}]
+      ["_" bytecode {"+" Label Bytecode}]
       [constant
-       [pool {"+" [Resource]}]]
-      ["[0]" type {"+" [Type]}
+       [pool {"+" Resource}]]
+      ["[0]" type {"+" Type}
        ["[0]" category]]]]]]
   ["[0]" //
    ["//[1]" /// "_"
     ["[1][0]" type]
     [//////
-     [arity {"+" [Arity]}]]]])
+     [arity {"+" Arity}]]]])
 
 (def: .public name "impl")
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux
index b5164fca9..6ac774c58 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/init.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" [Type type]}
+   [lux {"-" Type type}
     [abstract
      ["[0]" monad]]
     [control
@@ -12,14 +12,14 @@
       ["[0]" list ("[1]#[0]" monoid functor)]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
-      ["[0]" method {"+" [Method]}]
+      ["_" bytecode {"+" Bytecode}]
+      ["[0]" method {"+" Method}]
       [encoding
        ["[0]" unsigned]]
       [constant
-       [pool {"+" [Resource]}]]
-      ["[0]" type {"+" [Type]}
-       ["[0]" category {"+" [Class Value]}]]]]]]
+       [pool {"+" Resource}]]
+      ["[0]" type {"+" Type}
+       ["[0]" category {"+" Class Value}]]]]]]
   ["[0]" //
    ["[1][0]" implementation]
    ["/[1]" // "_"
@@ -34,12 +34,12 @@
      ["[1][0]" type]
      ["[1][0]" reference]
      [////
-      [analysis {"+" [Environment]}]
-      [synthesis {"+" [Synthesis]}]
+      [analysis {"+" Environment}]
+      [synthesis {"+" Synthesis}]
       [///
-       ["[0]" arity {"+" [Arity]}]
+       ["[0]" arity {"+" Arity}]
        [reference
-        [variable {"+" [Register]}]]]]]]])
+        [variable {"+" Register}]]]]]]])
 
 (def: .public name "<init>")
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
index 105718c78..fc899ac66 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/new.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [Type type]}
+   [lux {"-" Type type}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      [number
       ["n" nat]]
@@ -10,17 +10,17 @@
       ["[0]" list]]]
     [target
      [jvm
-      ["[0]" field {"+" [Field]}]
-      ["[0]" method {"+" [Method]}]
-      ["_" bytecode {"+" [Bytecode]}]
+      ["[0]" field {"+" Field}]
+      ["[0]" method {"+" Method}]
+      ["_" bytecode {"+" Bytecode}]
       ["[0]" constant
-       [pool {"+" [Resource]}]]
-      [type {"+" [Type]}
-       ["[0]" category {"+" [Class Value Return]}]]]]
+       [pool {"+" Resource}]]
+      [type {"+" Type}
+       ["[0]" category {"+" Class Value Return}]]]]
     [tool
      [compiler
       [meta
-       ["[0]" archive {"+" [Archive]}]]]]]]
+       ["[0]" archive {"+" Archive}]]]]]]
   ["[0]" //
    ["[1][0]" init]
    ["[1][0]" implementation]
@@ -32,14 +32,14 @@
       ["[1][0]" foreign]
       ["[1][0]" partial]]]
     ["/[1]" // "_"
-     [runtime {"+" [Operation Phase]}]
+     [runtime {"+" Operation Phase}]
      ["[1][0]" value]
      ["[1][0]" reference]
      [////
-      [analysis {"+" [Environment]}]
-      [synthesis {"+" [Synthesis]}]
+      [analysis {"+" Environment}]
+      [synthesis {"+" Synthesis}]
       [///
-       ["[0]" arity {"+" [Arity]}]
+       ["[0]" arity {"+" Arity}]
        ["[0]" phase]]]]]])
 
 (def: .public (instance' foreign_setup class environment arity)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
index d70718d0a..df16fb319 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/function/method/reset.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux {"-" [Type type]}
+   [lux {"-" Type type}
     [data
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [target
      [jvm
-      ["[0]" method {"+" [Method]}]
-      ["_" bytecode {"+" [Bytecode]}]
+      ["[0]" method {"+" Method}]
+      ["_" bytecode {"+" Bytecode}]
       [constant
-       [pool {"+" [Resource]}]]
-      ["[0]" type {"+" [Type]}
-       ["[0]" category {"+" [Class]}]]]]]]
+       [pool {"+" Resource}]]
+      ["[0]" type {"+" Type}
+       ["[0]" category {"+" Class}]]]]]]
   ["[0]" //
    ["[1][0]" new]
    ["/[1]" // "_"
@@ -21,10 +21,10 @@
     ["/[1]" // "_"
      ["[1][0]" reference]
      [////
-      [analysis {"+" [Environment]}]
-      [synthesis {"+" [Synthesis]}]
+      [analysis {"+" Environment}]
+      [synthesis {"+" Synthesis}]
       [///
-       ["[0]" arity {"+" [Arity]}]]]]]])
+       ["[0]" arity {"+" Arity}]]]]]])
 
 (def: .public name "reset")
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
index bc812c85b..e9b49fa1e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/host.lux
@@ -1,36 +1,36 @@
 (.module:
   [library
-   [lux {"-" [Definition]}
-    ["[0]" ffi {"+" [import: do_to object]}]
+   [lux {"-" Definition}
+    ["[0]" ffi {"+" import: do_to object}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      pipe
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
-     ["[0]" io {"+" [IO io]}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
+     ["[0]" io {"+" IO io}]
      [concurrency
-      ["[0]" atom {"+" [Atom atom]}]]]
+      ["[0]" atom {"+" Atom atom}]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" array]
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" row]]
      ["[0]" format "_"
       ["[1]" binary]]]
     [target
      [jvm
-      ["[0]" loader {"+" [Library]}]
-      ["_" bytecode {"+" [Bytecode]}]
-      ["[0]" modifier {"+" [Modifier]} ("[1]#[0]" monoid)]
-      ["[0]" field {"+" [Field]}]
-      ["[0]" method {"+" [Method]}]
+      ["[0]" loader {"+" Library}]
+      ["_" bytecode {"+" Bytecode}]
+      ["[0]" modifier {"+" Modifier} ("[1]#[0]" monoid)]
+      ["[0]" field {"+" Field}]
+      ["[0]" method {"+" Method}]
       ["[0]" version]
-      ["[0]" class {"+" [Class]}]
+      ["[0]" class {"+" Class}]
       ["[0]" encoding "_"
        ["[1]/[0]" name]]
       ["[0]" type
@@ -39,7 +39,7 @@
      [compiler
       ["[0]" name]]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Definition]}]]
+   ["[1][0]" runtime {"+" Definition}]]
   )
 
 (import: java/lang/reflect/Field
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
index 7491bcb1f..644287c38 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/loop.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]]
     [data
@@ -13,17 +13,17 @@
       ["[0]" list ("[1]#[0]" functor)]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Label Bytecode]} ("[1]#[0]" monad)]]]]]
+      ["_" bytecode {"+" Label Bytecode} ("[1]#[0]" monad)]]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" value]
    [////
-    ["[0]" synthesis {"+" [Path Synthesis]}]
+    ["[0]" synthesis {"+" Path Synthesis}]
     ["[0]" generation]
     [///
      ["[0]" phase]
      [reference
-      [variable {"+" [Register]}]]]]])
+      [variable {"+" Register}]]]]])
 
 (def: (invariant? register changeS)
   (-> Register Synthesis Bit)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
index daf8fa2fc..b22829f2e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/primitive.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [i64]}
-    ["[0]" ffi {"+" [import:]}]
+   [lux {"-" i64}
+    ["[0]" ffi {"+" import:}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
+      ["_" bytecode {"+" Bytecode}]
       ["[0]" type]
       [encoding
        ["[0]" signed]]]]]]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux
index da666b3d6..cfe9bace9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/program.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [Definition]}
+   [lux {"-" Definition}
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try]]
     [data
@@ -12,17 +12,17 @@
       ["[1]" binary]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
-      ["[0]" modifier {"+" [Modifier]} ("[1]#[0]" monoid)]
-      ["[0]" method {"+" [Method]}]
+      ["_" bytecode {"+" Bytecode}]
+      ["[0]" modifier {"+" Modifier} ("[1]#[0]" monoid)]
+      ["[0]" method {"+" Method}]
       ["[0]" version]
-      ["[0]" class {"+" [Class]}]
+      ["[0]" class {"+" Class}]
       [encoding
        ["[0]" name]]
       ["[0]" type
        ["[0]" reflection]]]]]]
   ["[0]" //
-   ["[1][0]" runtime {"+" [Definition]}]
+   ["[1][0]" runtime {"+" Definition}]
    ["[1][0]" function/abstract]])
 
 (def: .public class
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux
index 42434a35d..03cb18916 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/reference.lux
@@ -2,18 +2,18 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
+      ["_" bytecode {"+" Bytecode}]
       ["[0]" type]
       [encoding
        ["[0]" unsigned]]]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation]}]
+   ["[1][0]" runtime {"+" Operation}]
    ["[1][0]" value]
    ["[1][0]" type]
    ["//[1]" /// "_"
@@ -22,9 +22,9 @@
      [///
       ["[1]" phase ("operation#[0]" monad)]
       [reference
-       ["[0]" variable {"+" [Register Variable]}]]
+       ["[0]" variable {"+" Register Variable}]]
       [meta
-       [archive {"+" [Archive]}]]]]]])
+       [archive {"+" Archive}]]]]]])
 
 (def: .public this
   (Bytecode Any)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
index d3eb4af34..d8d042c67 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/runtime.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux {"-" [Type Definition Label case false true try]}
+   [lux {"-" Type Definition Label case false true try}
     [abstract
-     ["[0]" monad {"+" [do]}]
+     ["[0]" monad {"+" do}]
      ["[0]" enum]]
     [control
      ["[0]" try]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]
      ["[0]" format "_"
       ["[1]" binary]]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [math
      [number
       ["n" nat]
@@ -22,18 +22,18 @@
       ["[0]" i64]]]
     [target
      ["[0]" jvm "_"
-      ["_" bytecode {"+" [Label Bytecode]}]
-      ["[0]" modifier {"+" [Modifier]} ("[1]#[0]" monoid)]
-      ["[0]" field {"+" [Field]}]
-      ["[0]" method {"+" [Method]}]
+      ["_" bytecode {"+" Label Bytecode}]
+      ["[0]" modifier {"+" Modifier} ("[1]#[0]" monoid)]
+      ["[0]" field {"+" Field}]
+      ["[0]" method {"+" Method}]
       ["[1]/[0]" version]
-      ["[0]" class {"+" [Class]}]
+      ["[0]" class {"+" Class}]
       ["[0]" constant
-       [pool {"+" [Resource]}]]
+       [pool {"+" Resource}]]
       [encoding
        ["[0]" name]]
-      ["[0]" type {"+" [Type]}
-       ["[0]" category {"+" [Return' Value']}]
+      ["[0]" type {"+" Type}
+       ["[0]" category {"+" Return' Value'}]
        ["[0]" reflection]]]]]]
   ["[0]" // "_"
    ["[1][0]" type]
@@ -52,12 +52,12 @@
      ["[0]" generation]
      [///
       ["[1]" phase]
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       [reference
-       [variable {"+" [Register]}]]
+       [variable {"+" Register}]]
       [meta
-       [io {"+" [lux_context]}]
-       [archive {"+" [Archive]}]]]]]])
+       [io {"+" lux_context}]
+       [archive {"+" Archive}]]]]]])
 
 (type: .public Byte_Code
   Binary)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
index 867142e35..8b6eb089a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/structure.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      [number
       ["[0]" i32]]
@@ -10,16 +10,16 @@
       ["[0]" list]]]
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
+      ["_" bytecode {"+" Bytecode}]
       ["[0]" type]
       [encoding
        ["[0]" signed]]]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     [///
      ["[0]" phase]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux
index 780261e43..bdad01192 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/jvm/value.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux {"-" [Type type]}
+   [lux {"-" Type type}
     [target
      [jvm
-      ["_" bytecode {"+" [Bytecode]}]
-      ["[0]" type {"+" [Type]} ("[1]#[0]" equivalence)
-       [category {"+" [Primitive]}]
+      ["_" bytecode {"+" Bytecode}]
+      ["[0]" type {"+" Type} ("[1]#[0]" equivalence)
+       [category {"+" Primitive}]
        ["[0]" box]]]]]])
 
 (def: .public field "value")
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux
index 2a6a5da82..a6e053c61 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [target
      ["_" lua]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase]}]
+   [runtime {"+" Phase}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
@@ -23,12 +23,12 @@
        [lua
         ["[1]/[0]" common]]]]
      ["/[1]" // "_"
-      [analysis {"+" []}]
+      [analysis {"+" }]
       ["[0]" synthesis]
       ["//[1]" /// "_"
        ["[1][0]" phase ("[1]#[0]" monad)]
-       [reference {"+" []}
-        [variable {"+" []}]]]]]]])
+       [reference {"+" }
+        [variable {"+" }]]]]]]])
 
 (exception: .public cannot_recur_as_an_expression)
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
index ff367f923..71ec87fe1 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/case.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux {"-" [case let if]}
+   [lux {"-" case let if}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
     [target
-     ["_" lua {"+" [Expression Var Statement]}]]]]
+     ["_" lua {"+" Expression Var Statement}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Phase! Generator Generator!]}]
+   ["[1][0]" runtime {"+" Operation Phase Phase! Generator Generator!}]
    ["[1][0]" reference]
    ["[1][0]" primitive]
    ["/[1]" // "_"
@@ -21,14 +21,14 @@
      ["[1][0]" synthesis "_"
       ["[1]/[0]" case]]
      ["/[1]" // "_"
-      ["[1][0]" synthesis {"+" [Member Synthesis Path]}]
+      ["[1][0]" synthesis {"+" Member Synthesis Path}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        [reference
-        ["[1][0]" variable {"+" [Register]}]]
+        ["[1][0]" variable {"+" Register}]]
        ["[1][0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}]]]]]]])
+        [archive {"+" Archive}]]]]]]])
 
 (def: .public register
   (-> Register Var)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
index cfe9454bf..0c24ad7df 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/function.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux {"-" [Tuple Variant function]}
+   [lux {"-" Tuple Variant function}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      pipe]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [target
-     ["_" lua {"+" [Var Expression Label Statement]}]]]]
+     ["_" lua {"+" Var Expression Label Statement}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Phase! Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Phase! Generator}]
    ["[1][0]" reference]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     [analysis {"+" [Variant Tuple Abstraction Application Analysis]}]
-     [synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
+     [analysis {"+" Variant Tuple Abstraction Application Analysis}]
+     [synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
      ["//[1]" /// "_"
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[1][0]" phase ("[1]#[0]" monad)]
       [reference
-       [variable {"+" [Register Variable]}]]]]]])
+       [variable {"+" Register Variable}]]]]]])
 
 (def: .public (apply expression archive [functionS argsS+])
   (Generator (Application Synthesis))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
index 34bd663c7..8e62fd7c8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/loop.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [Scope]}
+   [lux {"-" Scope}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" set]]]
@@ -14,21 +14,21 @@
      [number
       ["n" nat]]]
     [target
-     ["_" lua {"+" [Var Expression Label Statement]}]]]]
+     ["_" lua {"+" Var Expression Label Statement}]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Phase! Generator Generator!]}]
+   [runtime {"+" Operation Phase Phase! Generator Generator!}]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     ["[0]"synthesis {"+" [Scope Synthesis]}]
+     ["[0]"synthesis {"+" Scope Synthesis}]
      ["[1][0]" generation]
      ["//[1]" /// "_"
       ["[1][0]" phase]
       [meta
-       [archive {"+" [Archive]}]]
+       [archive {"+" Archive}]]
       [reference
-       [variable {"+" [Register]}]]]]]])
+       [variable {"+" Register}]]]]]])
 
 (def: @scope
   (-> Nat Label)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux
index d6bd49cd2..5f801a1b1 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/primitive.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     [target
-     ["_" lua {"+" [Literal]}]]]])
+     ["_" lua {"+" Literal}]]]])
 
 (template [<name> <type> <implementation>]
   [(def: .public <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux
index 703e88fe5..decdecf12 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/reference.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [target
-     ["_" lua {"+" [Expression]}]]]]
+     ["_" lua {"+" Expression}]]]]
   [///
-   [reference {"+" [System]}]])
+   [reference {"+" System}]])
 
 (implementation: .public system
   (System Expression)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
index 2594b3cff..b8216596f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [Location]}
+   [lux {"-" Location}
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
@@ -11,32 +11,32 @@
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["[0]" i64]]]
     ["@" target
-     ["_" lua {"+" [Expression Location Var Computation Literal Label Statement]}]]]]
+     ["_" lua {"+" Expression Location Var Computation Literal Label Statement}]]]]
   ["[0]" /// "_"
    ["[1][0]" reference]
    ["//[1]" /// "_"
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["[1][0]" generation]
     ["//[1]" ///
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]
+      [variable {"+" Register}]]
      [meta
-      [archive {"+" [Output Archive]}
-       ["[0]" artifact {"+" [Registry]}]]]]]])
+      [archive {"+" Output Archive}
+       ["[0]" artifact {"+" Registry}]]]]]])
 
 (template [<name> <base>]
   [(type: .public <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux
index 84a223488..b1cb4161c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/structure.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux {"-" [Tuple Variant]}
+   [lux {"-" Tuple Variant}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [target
-     ["_" lua {"+" [Expression]}]]]]
+     ["_" lua {"+" Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["//[1]" /// "_"
      ["[1][0]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux
index 65ec8d957..df16028a6 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [target
      ["_" php]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase Phase!]}]
+   [runtime {"+" Phase Phase!}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
@@ -20,12 +20,12 @@
     ["/[1]" // "_"
      ["[1][0]" extension]
      ["/[1]" // "_"
-      [analysis {"+" []}]
+      [analysis {"+" }]
       ["[1][0]" synthesis]
       ["//[1]" /// "_"
        ["[1][0]" phase ("[1]#[0]" monad)]
-       [reference {"+" []}
-        [variable {"+" []}]]]]]]])
+       [reference {"+"}
+        [variable {"+"}]]]]]]])
 
 (def: (statement expression archive synthesis)
   Phase!
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux
index ea0937e06..fcdccdb3b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/case.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [case let if]}
+   [lux {"-" case let if}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
@@ -14,9 +14,9 @@
      [number
       ["i" int]]]
     [target
-     ["_" php {"+" [Expression Var Statement]}]]]]
+     ["_" php {"+" Expression Var Statement}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Phase! Generator Generator!]}]
+   ["[1][0]" runtime {"+" Operation Phase Phase! Generator Generator!}]
    ["[1][0]" reference]
    ["[1][0]" primitive]
    ["/[1]" // "_"
@@ -25,14 +25,14 @@
      ["[1][0]" synthesis "_"
       ["[1]/[0]" case]]
      ["/[1]" // "_"
-      ["[1][0]" synthesis {"+" [Member Synthesis Path]}]
+      ["[1][0]" synthesis {"+" Member Synthesis Path}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        [reference
-        ["[1][0]" variable {"+" [Register]}]]
+        ["[1][0]" variable {"+" Register}]]
        ["[1][0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}]]]]]]])
+        [archive {"+" Archive}]]]]]]])
 
 (def: .public register
   (-> Register Var)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux
index ebdd43f89..359031ab8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension.lux
@@ -5,7 +5,7 @@
      [collection
       ["[0]" dictionary]]]]]
   [//
-   [runtime {"+" [Bundle]}]]
+   [runtime {"+" Bundle}]]
   [/
    ["[0]" common]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
index 2a821d617..050286fc8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/extension/common.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]]
     [data
@@ -13,13 +13,13 @@
      [collection
       ["[0]" dictionary]]]
     [target
-     ["_" php {"+" [Expression]}]]]]
+     ["_" php {"+" Expression}]]]]
   ["[0]" /// "_"
-   ["[1][0]" runtime {"+" [Operation Phase Handler Bundle]}]
+   ["[1][0]" runtime {"+" Operation Phase Handler Bundle}]
    ["[1][0]" primitive]
    [//
-    [extension {"+" [Nullary Unary Binary Trinary
-                     nullary unary binary trinary]}]
+    [extension {"+" Nullary Unary Binary Trinary
+                nullary unary binary trinary}]
     [//
      [extension
       ["[0]" bundle]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux
index 2fc8b837e..3804b8e19 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/function.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux {"-" [Global function]}
+   [lux {"-" Global function}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      pipe]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [target
-     ["_" php {"+" [Var Global Expression Argument Label Statement]}]]]]
+     ["_" php {"+" Var Global Expression Argument Label Statement}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Phase! Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Phase! Generator}]
    ["[1][0]" reference]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     [analysis {"+" [Variant Tuple Abstraction Application Analysis]}]
-     [synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
+     [analysis {"+" Variant Tuple Abstraction Application Analysis}]
+     [synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
      ["//[1]" /// "_"
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[1][0]" phase ("[1]#[0]" monad)]
       [reference
-       [variable {"+" [Register Variable]}]]]]]])
+       [variable {"+" Register Variable}]]]]]])
 
 (def: .public (apply expression archive [functionS argsS+])
   (Generator (Application Synthesis))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
index 22e48c266..709daa132 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/loop.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux {"-" [Scope]}
+   [lux {"-" Scope}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [math
      [number
       ["n" nat]]]
     [target
-     ["_" php {"+" [Var Expression Label Statement]}]]]]
+     ["_" php {"+" Var Expression Label Statement}]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Phase! Generator Generator!]}]
+   [runtime {"+" Operation Phase Phase! Generator Generator!}]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
@@ -24,14 +24,14 @@
      [synthesis
       ["[0]" case]]
      ["/[1]" // "_"
-      ["[0]"synthesis {"+" [Scope Synthesis]}]
+      ["[0]"synthesis {"+" Scope Synthesis}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        ["[1][0]" phase]
        [meta
-        [archive {"+" [Archive]}]]
+        [archive {"+" Archive}]]
        [reference
-        [variable {"+" [Register]}]]]]]]])
+        [variable {"+" Register}]]]]]]])
 
 (def: @scope
   (-> Nat Label)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux
index d70ccee56..24be9312c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/primitive.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     [control
-     [pipe {"+" [cond> new>]}]]
+     [pipe {"+" cond> new>}]]
     [math
      [number
       ["[0]" frac]]]
     [target
-     ["_" php {"+" [Literal Expression]}]]]]
+     ["_" php {"+" Literal Expression}]]]]
   ["[0]" // "_"
    ["[1][0]" runtime]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux
index b1528276e..025e81e1c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/reference.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [target
-     ["_" php {"+" [Expression]}]]]]
+     ["_" php {"+" Expression}]]]]
   [///
-   [reference {"+" [System]}]])
+   [reference {"+" System}]])
 
 (implementation: .public system
   (System Expression)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
index 822607732..3dc089d50 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [Location]}
+   [lux {"-" Location}
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
@@ -11,32 +11,32 @@
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["[0]" i64]]]
     ["@" target
-     ["_" php {"+" [Expression Label Constant Var Computation Literal Statement]}]]]]
+     ["_" php {"+" Expression Label Constant Var Computation Literal Statement}]]]]
   ["[0]" /// "_"
    ["[1][0]" reference]
    ["//[1]" /// "_"
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["[1][0]" generation]
     ["//[1]" ///
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]
+      [variable {"+" Register}]]
      [meta
-      [archive {"+" [Output Archive]}
-       ["[0]" artifact {"+" [Registry]}]]]]]])
+      [archive {"+" Output Archive}
+       ["[0]" artifact {"+" Registry}]]]]]])
 
 (template [<name> <base>]
   [(type: .public <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux
index bcc64b14d..984e57acd 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/structure.lux
@@ -2,18 +2,18 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      [collection
       ["[0]" list]]]
     [target
-     ["_" php {"+" [Expression]}]]]]
+     ["_" php {"+" Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["//[1]" /// "_"
      ["[1][0]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux
index a1235130d..bb6ee4429 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [target
      ["_" python]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase]}]
+   [runtime {"+" Phase}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
@@ -23,12 +23,12 @@
        [python
         ["[1]/[0]" common]]]]
      ["/[1]" // "_"
-      [analysis {"+" []}]
+      [analysis {"+" }]
       ["[1][0]" synthesis]
       ["//[1]" /// "_"
        ["[1][0]" phase ("[1]#[0]" monad)]
-       [reference {"+" []}
-        [variable {"+" []}]]]]]]])
+       [reference {"+"}
+        [variable {"+"}]]]]]]])
 
 (exception: .public cannot_recur_as_an_expression)
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
index 04e0fdfba..88a0f48ad 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/case.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux {"-" [case let if]}
+   [lux {"-" case let if}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
@@ -14,9 +14,9 @@
       ["n" nat]
       ["i" int]]]
     [target
-     ["_" python {"+" [Expression SVar Statement]}]]]]
+     ["_" python {"+" Expression SVar Statement}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator Phase! Generator!]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator Phase! Generator!}]
    ["[1][0]" reference]
    ["[1][0]" primitive]
    ["/[1]" // "_"
@@ -25,14 +25,14 @@
      [synthesis
       ["[0]" case]]
      ["/[1]" // "_"
-      ["[1][0]" synthesis {"+" [Member Synthesis Path]}]
+      ["[1][0]" synthesis {"+" Member Synthesis Path}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        [reference
-        ["[1][0]" variable {"+" [Register]}]]
+        ["[1][0]" variable {"+" Register}]]
        ["[1][0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}]]]]]]])
+        [archive {"+" Archive}]]]]]]])
 
 (def: .public (identifier prefix)
   (-> Text (Operation SVar))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux
index 00eb7732f..941ea9959 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/function.lux
@@ -1,34 +1,34 @@
 (.module:
   [library
-   [lux {"-" [function]}
+   [lux {"-" function}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [target
-     ["_" python {"+" [SVar Expression Statement]}]]]]
+     ["_" python {"+" SVar Expression Statement}]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Generator Phase! Generator!]}]
+   [runtime {"+" Operation Phase Generator Phase! Generator!}]
    ["[1][0]" reference]
    ["[1][0]" case]
    ["[1][0]" loop]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     [analysis {"+" [Environment Abstraction Application Analysis]}]
-     [synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
+     [analysis {"+" Environment Abstraction Application Analysis}]
+     [synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
      ["//[1]" /// "_"
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[1][0]" phase]
       [reference
-       [variable {"+" [Register Variable]}]]
+       [variable {"+" Register Variable}]]
       [meta
-       [archive {"+" [Archive]}
+       [archive {"+" Archive}
         ["[0]" artifact]]]]]]])
 
 (def: .public (apply expression archive [functionS argsS+])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
index 2eae48279..570d262d7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/loop.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [Scope]}
+   [lux {"-" Scope}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
@@ -14,9 +14,9 @@
      [number
       ["n" nat]]]
     [target
-     ["_" python {"+" [Expression SVar Statement]}]]]]
+     ["_" python {"+" Expression SVar Statement}]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Generator Phase! Generator!]}]
+   [runtime {"+" Operation Phase Generator Phase! Generator!}]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
@@ -24,12 +24,12 @@
      [synthesis
       ["[0]" case]]
      ["/[1]" // "_"
-      ["[0]" synthesis {"+" [Scope Synthesis]}]
+      ["[0]" synthesis {"+" Scope Synthesis}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        ["[1][0]" phase]
        [reference
-        ["[1][0]" variable {"+" [Register]}]]]]]]])
+        ["[1][0]" variable {"+" Register}]]]]]]])
 
 (def: (setup offset bindings body)
   (-> Register (List (Expression Any)) (Statement Any) (Statement Any))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux
index 7ba155bbd..4d0e580d4 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/primitive.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     [target
-     ["_" python {"+" [Expression]}]]]]
+     ["_" python {"+" Expression}]]]]
   ["[0]" // "_"
    ["[1][0]" runtime]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux
index 647090e47..c5402b2d7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/reference.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [target
-     ["_" python {"+" [Expression]}]]]]
+     ["_" python {"+" Expression}]]]]
   [///
-   [reference {"+" [System]}]])
+   [reference {"+" System}]])
 
 (implementation: .public system
   (System (Expression Any))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
index a6b9decab..a4948041f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [++]}
+   [lux {"-" ++}
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
@@ -11,34 +11,34 @@
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["f" frac]
       ["[0]" i64]]]
     ["@" target
-     ["_" python {"+" [Expression SVar Computation Literal Statement]}]]]]
+     ["_" python {"+" Expression SVar Computation Literal Statement}]]]]
   ["[0]" /// "_"
    ["[1][0]" reference]
    ["//[1]" /// "_"
     ["$" version]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["[1][0]" generation]
     ["//[1]" ///
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]
+      [variable {"+" Register}]]
      [meta
-      [archive {"+" [Output Archive]}
-       ["[0]" artifact {"+" [Registry]}]]]]]])
+      [archive {"+" Output Archive}
+       ["[0]" artifact {"+" Registry}]]]]]])
 
 (template [<name> <base>]
   [(type: .public <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux
index 86fe0b77c..624e4c077 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/structure.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux {"-" [Variant Tuple]}
+   [lux {"-" Variant Tuple}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [target
-     ["_" python {"+" [Expression]}]]]]
+     ["_" python {"+" Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["//[1]" /// "_"
      ["[1][0]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux
index 8ef9f3f20..24933ea51 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r.lux
@@ -2,11 +2,11 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [target
      ["_" r]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase]}]
+   [runtime {"+" Phase}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
@@ -18,12 +18,12 @@
     ["/[1]" // "_"
      ["[1][0]" extension]
      ["/[1]" // "_"
-      [analysis {"+" []}]
+      [analysis {"+" }]
       ["[1][0]" synthesis]
       ["//[1]" /// "_"
        ["[1][0]" phase ("[1]#[0]" monad)]
-       [reference {"+" []}
-        [variable {"+" []}]]]]]]])
+       [reference {"+"}
+        [variable {"+"}]]]]]]])
 
 (def: .public (generate archive synthesis)
   Phase
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux
index 7f711dc98..265b1fd46 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/case.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [case let if]}
+   [lux {"-" case let if}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
@@ -16,9 +16,9 @@
      [number
       ["i" int]]]
     [target
-     ["_" r {"+" [Expression SVar]}]]]]
+     ["_" r {"+" Expression SVar}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" reference]
    ["[1][0]" primitive]
    ["/[1]" // "_"
@@ -27,14 +27,14 @@
      ["[1][0]" synthesis "_"
       ["[1]/[0]" case]]
      ["/[1]" // "_"
-      ["[1][0]" synthesis {"+" [Member Synthesis Path]}]
+      ["[1][0]" synthesis {"+" Member Synthesis Path}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        [reference
-        ["[1][0]" variable {"+" [Register]}]]
+        ["[1][0]" variable {"+" Register}]]
        ["[1][0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}]]]]]]])
+        [archive {"+" Archive}]]]]]]])
 
 (def: .public register
   (-> Register SVar)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux
index 662561521..a0b0428d0 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/function.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux {"-" [function]}
+   [lux {"-" function}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      pipe]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [target
-     ["_" r {"+" [Expression SVar]}]]]]
+     ["_" r {"+" Expression SVar}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" reference]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     [analysis {"+" [Variant Tuple Abstraction Application Analysis]}]
-     [synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
+     [analysis {"+" Variant Tuple Abstraction Application Analysis}]
+     [synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
      ["//[1]" /// "_"
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[1][0]" phase ("[1]#[0]" monad)]
       [reference
-       [variable {"+" [Register Variable]}]]
+       [variable {"+" Register Variable}]]
       [meta
        [archive
         ["[0]" artifact]]]]]]])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux
index d66028cb7..29bd92b23 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/loop.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux {"-" [Scope]}
+   [lux {"-" Scope}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [math
      [number
       ["n" nat]]]
     [target
      ["_" r]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Generator]}]
+   [runtime {"+" Operation Phase Generator}]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
@@ -24,14 +24,14 @@
      [synthesis
       ["[0]" case]]
      ["/[1]" // "_"
-      ["[0]"synthesis {"+" [Scope Synthesis]}]
+      ["[0]"synthesis {"+" Scope Synthesis}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        ["[1][0]" phase]
        [meta
-        [archive {"+" [Archive]}]]
+        [archive {"+" Archive}]]
        [reference
-        [variable {"+" [Register]}]]]]]]])
+        [variable {"+" Register}]]]]]]])
 
 (def: .public (scope expression archive [offset initsS+ bodyS])
   (Generator (Scope Synthesis))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux
index 2aa8b7645..efeb2f6d5 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/primitive.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     [target
-     ["_" r {"+" [Expression]}]]]]
+     ["_" r {"+" Expression}]]]]
   ["[0]" // "_"
    ["[1][0]" runtime]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
index 2c61e52f2..d61ff76b1 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
@@ -1,23 +1,23 @@
 (.module:
   lux
   (lux (control [library
-                 [monad {"+" [do]}]]
-                ["ex" exception {"+" [exception:]}]
+                 [monad {"+" do}]]
+                ["ex" exception {"+" exception:}]
                 ["p" parser])
        (data ["e" error]
              [text]
              text/format
              [number]
              (coll [list "list/" Functor<List>]
-                   (dictionary ["dict" unordered {"+" [Dict]}])))
-       [macro {"+" [with_identifiers]}]
+                   (dictionary ["dict" unordered {"+" Dict}])))
+       [macro {"+" with_identifiers}]
        (macro [code]
-              ["s" syntax {"+" [syntax:]}])
+              ["s" syntax {"+" syntax:}])
        [host])
   (luxc ["&" lang]
         (lang ["la" analysis]
               ["ls" synthesis]
-              (host [r {"+" [Expression]}])))
+              (host [r {"+" Expression}])))
   [///]
   (/// ["[0]T" runtime]
        ["[0]T" case]
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
index 54a0c637b..e074b2f6a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/host.lux
@@ -1,16 +1,16 @@
 (.module:
   lux
   (lux (control [library
-                 [monad {"+" [do]}]])
+                 [monad {"+" do}]])
        (data [text]
              text/format
              (coll [list "list/" Functor<List>]
-                   (dictionary ["dict" unordered {"+" [Dict]}])))
+                   (dictionary ["dict" unordered {"+" Dict}])))
        [macro "macro/" Monad<Meta>])
   (luxc ["&" lang]
         (lang ["la" analysis]
               ["ls" synthesis]
-              (host [ruby {"+" [Ruby Expression Statement]}])))
+              (host [ruby {"+" Ruby Expression Statement}])))
   [///]
   (/// ["[0]T" runtime])
   (// ["@" common]))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux
index cfbb6f02c..4ba35fe1a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/reference.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [target
-     ["_" r {"+" [Expression]}]]]]
+     ["_" r {"+" Expression}]]]]
   [///
-   [reference {"+" [System]}]])
+   [reference {"+" System}]])
 
 (implementation: .public system
   (System Expression)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
index 6611c77c4..fae9bcf9f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [Location ++ i64]}
+   [lux {"-" Location ++ i64}
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
@@ -11,35 +11,35 @@
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["n" nat]
       ["i" int ("[1]#[0]" interval)]
       ["[0]" i64]]]
     ["@" target
-     ["_" r {"+" [SVar Expression]}]]]]
+     ["_" r {"+" SVar Expression}]]]]
   ["[0]" /// "_"
    ["[1][0]" reference]
    ["//[1]" /// "_"
-    [analysis {"+" [Variant]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["[1][0]" generation]
     ["//[1]" ///
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]
+      [variable {"+" Register}]]
      [meta
-      [archive {"+" [Output Archive]}
-       ["[0]" artifact {"+" [Registry]}]]]]]])
+      [archive {"+" Output Archive}
+       ["[0]" artifact {"+" Registry}]]]]]])
 
 (def: module_id
   0)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux
index d28a83f8d..eb5fd0f50 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/structure.lux
@@ -2,18 +2,18 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      [collection
       ["[0]" list]]]
     [target
-     ["_" r {"+" [Expression]}]]]]
+     ["_" r {"+" Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["//[1]" /// "_"
      ["[1][0]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux
index dfb11895a..7c7c20ea1 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/reference.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux {"-" [local]}
+   [lux {"-" local}
     ["@" target]
     [data
      [text
-      ["%" format {"+" [format]}]]]]]
+      ["%" format {"+" format}]]]]]
   ["[0]" //// "_"
    ["[0]" version]
-   ["[1][0]" generation {"+" [Context]}]
+   ["[1][0]" generation {"+" Context}]
    ["//[1]" /// "_"
-    ["[0]" reference {"+" [Reference]}
-     ["[0]" variable {"+" [Register Variable]}]]
+    ["[0]" reference {"+" Reference}
+     ["[0]" variable {"+" Register Variable}]]
     ["[0]" phase ("[1]#[0]" monad)]
     [meta
-     [archive {"+" [Archive]}]]]])
+     [archive {"+" Archive}]]]])
 
 ... This universe constant is for languages where one can't just turn all compiled definitions
 ... into the local variables of some scoping function.
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux
index b8dd0c621..e249ece33 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [target
      ["_" ruby]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase Phase!]}]
+   [runtime {"+" Phase Phase!}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
@@ -23,12 +23,12 @@
        [ruby
         ["[1]/[0]" common]]]]
      ["/[1]" // "_"
-      [analysis {"+" []}]
+      [analysis {"+" }]
       ["[1][0]" synthesis]
       ["//[1]" /// "_"
        ["[1][0]" phase ("[1]#[0]" monad)]
-       [reference {"+" []}
-        [variable {"+" []}]]]]]]])
+       [reference {"+" }
+        [variable {"+" }]]]]]]])
 
 (exception: .public cannot_recur_as_an_expression)
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
index b37e129ae..f43fc7a9f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/case.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux {"-" [case let if]}
+   [lux {"-" case let if}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     [exception {"+" [exception:]}]]
+     [exception {"+" exception:}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
@@ -16,9 +16,9 @@
       ["n" nat]
       ["i" int]]]
     [target
-     ["_" ruby {"+" [Expression LVar Statement]}]]]]
+     ["_" ruby {"+" Expression LVar Statement}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator Phase! Generator!]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator Phase! Generator!}]
    ["[1][0]" reference]
    ["[1][0]" primitive]
    ["/[1]" // "_"
@@ -27,14 +27,14 @@
      [synthesis
       ["[0]" case]]
      ["/[1]" // "_"
-      ["[1][0]" synthesis {"+" [Member Synthesis Path]}]
+      ["[1][0]" synthesis {"+" Member Synthesis Path}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        [reference
-        ["[1][0]" variable {"+" [Register]}]]
+        ["[1][0]" variable {"+" Register}]]
        ["[1][0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}]]]]]]])
+        [archive {"+" Archive}]]]]]]])
 
 (def: .public (identifier prefix)
   (-> Text (Operation LVar))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
index 2fd93bdf3..7804b6fa9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/function.lux
@@ -1,34 +1,34 @@
 (.module:
   [library
-   [lux {"-" [Variant Tuple function]}
+   [lux {"-" Variant Tuple function}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [target
-     ["_" ruby {"+" [LVar GVar Expression Statement]}]]]]
+     ["_" ruby {"+" LVar GVar Expression Statement}]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Generator Phase! Generator!]}]
+   [runtime {"+" Operation Phase Generator Phase! Generator!}]
    ["[1][0]" reference]
    ["[1][0]" case]
    ["[1][0]" loop]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     [analysis {"+" [Variant Tuple Environment Abstraction Application Analysis]}]
-     [synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
+     [analysis {"+" Variant Tuple Environment Abstraction Application Analysis}]
+     [synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
      ["//[1]" /// "_"
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[1][0]" phase]
       [reference
-       [variable {"+" [Register Variable]}]]
+       [variable {"+" Register Variable}]]
       [meta
-       [archive {"+" [Archive]}
+       [archive {"+" Archive}
         ["[0]" artifact]]]]]]])
 
 (def: .public (apply expression archive [functionS argsS+])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
index 91eb9d7aa..7e6bd24ff 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/loop.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [Scope]}
+   [lux {"-" Scope}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
@@ -14,9 +14,9 @@
      [number
       ["n" nat]]]
     [target
-     ["_" ruby {"+" [Expression LVar Statement]}]]]]
+     ["_" ruby {"+" Expression LVar Statement}]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Generator Phase! Generator!]}]
+   [runtime {"+" Operation Phase Generator Phase! Generator!}]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
@@ -24,12 +24,12 @@
      [synthesis
       ["[0]" case]]
      ["/[1]" // "_"
-      ["[0]" synthesis {"+" [Scope Synthesis]}]
+      ["[0]" synthesis {"+" Scope Synthesis}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        ["[1][0]" phase]
        [reference
-        ["[1][0]" variable {"+" [Register]}]]]]]]])
+        ["[1][0]" variable {"+" Register}]]]]]]])
 
 (def: (setup offset bindings body)
   (-> Register (List Expression) Statement Statement)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux
index 40055af95..3aa0dea20 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/primitive.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     [target
-     ["_" ruby {"+" [Literal]}]]]])
+     ["_" ruby {"+" Literal}]]]])
 
 (template [<type> <name> <implementation>]
   [(def: .public <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux
index 8ac89ceb9..4647b0d01 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/reference.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [target
-     ["_" ruby {"+" [Expression]}]]]]
+     ["_" ruby {"+" Expression}]]]]
   [///
-   [reference {"+" [System]}]])
+   [reference {"+" System}]])
 
 (implementation: .public system
   (System Expression)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
index 9f28d622e..1dd09a7b2 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
@@ -3,7 +3,7 @@
    [lux "*"
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
@@ -11,33 +11,33 @@
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["[0]" i64]]]
     ["@" target
-     ["_" ruby {"+" [Expression LVar Computation Literal Statement]}]]]]
+     ["_" ruby {"+" Expression LVar Computation Literal Statement}]]]]
   ["[0]" /// "_"
    ["[1][0]" reference]
    ["//[1]" /// "_"
     ["$" version]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["[1][0]" generation]
     ["//[1]" ///
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]
+      [variable {"+" Register}]]
      [meta
-      [archive {"+" [Output Archive]}
-       ["[0]" artifact {"+" [Registry]}]]]]]])
+      [archive {"+" Output Archive}
+       ["[0]" artifact {"+" Registry}]]]]]])
 
 (template [<name> <base>]
   [(type: .public <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux
index cc645f541..f0a87724a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/structure.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux {"-" [Variant Tuple]}
+   [lux {"-" Variant Tuple}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [target
-     ["_" ruby {"+" [Expression]}]]]]
+     ["_" ruby {"+" Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["//[1]" /// "_"
      ["[1][0]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux
index 48a923dd6..12a559202 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme.lux
@@ -2,11 +2,11 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [target
      ["_" scheme]]]]
   ["[0]" / "_"
-   [runtime {"+" [Phase]}]
+   [runtime {"+" Phase}]
    ["[1][0]" primitive]
    ["[1][0]" structure]
    ["[1][0]" reference]
@@ -18,12 +18,12 @@
     ["/[1]" // "_"
      ["[1][0]" extension]
      ["/[1]" // "_"
-      [analysis {"+" []}]
+      [analysis {"+" }]
       ["[1][0]" synthesis]
       ["//[1]" /// "_"
        ["[1][0]" phase ("[1]#[0]" monad)]
-       [reference {"+" []}
-        [variable {"+" []}]]]]]]])
+       [reference {"+"}
+        [variable {"+"}]]]]]]])
 
 (def: .public (generate archive synthesis)
   Phase
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
index d603237c4..176b4e5dd 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/case.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [case let if]}
+   [lux {"-" case let if}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
@@ -16,9 +16,9 @@
      [number
       ["i" int]]]
     [target
-     ["_" scheme {"+" [Expression Computation Var]}]]]]
+     ["_" scheme {"+" Expression Computation Var}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" reference]
    ["[1][0]" primitive]
    ["/[1]" // "_"
@@ -27,14 +27,14 @@
      ["[1][0]" synthesis "_"
       ["[1]/[0]" case]]
      ["/[1]" // "_"
-      ["[1][0]" synthesis {"+" [Member Synthesis Path]}]
+      ["[1][0]" synthesis {"+" Member Synthesis Path}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        [reference
-        ["[1][0]" variable {"+" [Register]}]]
+        ["[1][0]" variable {"+" Register}]]
        ["[1][0]" phase ("[1]#[0]" monad)]
        [meta
-        [archive {"+" [Archive]}]]]]]]])
+        [archive {"+" Archive}]]]]]]])
 
 (def: .public register
   (-> Register Var)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux
index ebdd43f89..359031ab8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension.lux
@@ -5,7 +5,7 @@
      [collection
       ["[0]" dictionary]]]]]
   [//
-   [runtime {"+" [Bundle]}]]
+   [runtime {"+" Bundle}]]
   [/
    ["[0]" common]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
index 63c916eae..d070b09b2 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
@@ -2,31 +2,31 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["ex" exception {"+" [exception:]}]
+     ["ex" exception {"+" exception:}]
      [parser
       ["<[0]>" code]]]
     [data
      ["[0]" product]
      ["[0]" text]
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["f" frac]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
-      ["dict" dictionary {"+" [Dictionary]}]]]
-    ["[0]" macro {"+" [with_identifiers]}
+      ["dict" dictionary {"+" Dictionary}]]]
+    ["[0]" macro {"+" with_identifiers}
      ["[0]" code]
-     [syntax {"+" [syntax:]}]]
+     [syntax {"+" syntax:}]]
     [target
-     ["_" scheme {"+" [Expression Computation]}]]]]
+     ["_" scheme {"+" Expression Computation}]]]]
   ["[0]" /// "_"
-   ["[1][0]" runtime {"+" [Operation Phase Handler Bundle]}]
+   ["[1][0]" runtime {"+" Operation Phase Handler Bundle}]
    ["[1]//" ///
     ["[1][0]" extension
      ["[0]" bundle]]
     ["[1]/" // "_"
-     ["[1][0]" synthesis {"+" [Synthesis]}]]]])
+     ["[1][0]" synthesis {"+" Synthesis}]]]])
 
 (syntax: (Vector [size <code>.nat
                   elemT <code>.any])
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
index fb0127577..810dca8d8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/function.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux {"-" [function]}
+   [lux {"-" function}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      pipe]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [target
-     ["_" scheme {"+" [Expression Computation Var]}]]]]
+     ["_" scheme {"+" Expression Computation Var}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" reference]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
     ["//[1]" /// "_"
-     [analysis {"+" [Variant Tuple Abstraction Application Analysis]}]
-     [synthesis {"+" [Synthesis]}]
-     ["[1][0]" generation {"+" [Context]}]
+     [analysis {"+" Variant Tuple Abstraction Application Analysis}]
+     [synthesis {"+" Synthesis}]
+     ["[1][0]" generation {"+" Context}]
      ["//[1]" /// "_"
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[1][0]" phase ("[1]#[0]" monad)]
       [reference
-       [variable {"+" [Register Variable]}]]]]]])
+       [variable {"+" Register Variable}]]]]]])
 
 (def: .public (apply expression archive [functionS argsS+])
   (Generator (Application Synthesis))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
index fbec9f534..1fef5ee57 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/loop.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux {"-" [Scope]}
+   [lux {"-" Scope}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [math
      [number
       ["n" nat]]]
     [target
      ["_" scheme]]]]
   ["[0]" // "_"
-   [runtime {"+" [Operation Phase Generator]}]
+   [runtime {"+" Operation Phase Generator}]
    ["[1][0]" case]
    ["/[1]" // "_"
     ["[1][0]" reference]
@@ -24,14 +24,14 @@
      [synthesis
       ["[0]" case]]
      ["/[1]" // "_"
-      ["[0]"synthesis {"+" [Scope Synthesis]}]
+      ["[0]"synthesis {"+" Scope Synthesis}]
       ["[1][0]" generation]
       ["//[1]" /// "_"
        ["[1][0]" phase]
        [meta
-        [archive {"+" [Archive]}]]
+        [archive {"+" Archive}]]
        [reference
-        [variable {"+" [Register]}]]]]]]])
+        [variable {"+" Register}]]]]]]])
 
 (def: @scope
   (_.var "scope"))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux
index 05ce654e2..599f30a2f 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/primitive.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux {"-" [i64]}
+   [lux {"-" i64}
     [target
-     ["_" scheme {"+" [Expression]}]]]])
+     ["_" scheme {"+" Expression}]]]])
 
 (template [<name> <type> <code>]
   [(def: .public <name>
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux
index e72101b5b..79015435a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/reference.lux
@@ -2,9 +2,9 @@
   [library
    [lux "*"
     [target
-     ["_" scheme {"+" [Expression]}]]]]
+     ["_" scheme {"+" Expression}]]]]
   [///
-   [reference {"+" [System]}]])
+   [reference {"+" System}]])
 
 (implementation: .public system
   (System Expression)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
index 2b0006269..59fb09719 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [Location]}
+   [lux {"-" Location}
     ["[0]" meta]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
      ["<>" parser
@@ -11,33 +11,33 @@
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" row]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}
+     [number {"+" hex}
       ["[0]" i64]]]
     ["@" target
-     ["_" scheme {"+" [Expression Computation Var]}]]]]
+     ["_" scheme {"+" Expression Computation Var}]]]]
   ["[0]" /// "_"
    ["[1][0]" reference]
    ["//[1]" /// "_"
-    [analysis {"+" [Variant]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["[1][0]" generation]
     ["//[1]" ///
      ["[1][0]" phase]
      [reference
-      [variable {"+" [Register]}]]
+      [variable {"+" Register}]]
      [meta
-      [archive {"+" [Output Archive]}
-       ["[0]" artifact {"+" [Registry]}]]]]]])
+      [archive {"+" Output Archive}
+       ["[0]" artifact {"+" Registry}]]]]]])
 
 (def: module_id
   0)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux
index e06ff9743..01a90936b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/structure.lux
@@ -2,18 +2,18 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [data
      [collection
       ["[0]" list]]]
     [target
-     ["_" scheme {"+" [Expression]}]]]]
+     ["_" scheme {"+" Expression}]]]]
   ["[0]" // "_"
-   ["[1][0]" runtime {"+" [Operation Phase Generator]}]
+   ["[1][0]" runtime {"+" Operation Phase Generator}]
    ["[1][0]" primitive]
    ["///[1]" //// "_"
-    [analysis {"+" [Variant Tuple]}]
-    ["[1][0]" synthesis {"+" [Synthesis]}]
+    [analysis {"+" Variant Tuple}]
+    ["[1][0]" synthesis {"+" Synthesis}]
     ["//[1]" /// "_"
      ["[1][0]" phase ("[1]#[0]" monad)]]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux
index c3531d0fe..173da80a2 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux {"-" [primitive]}
+   [lux {"-" primitive}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" try]]
     [data
      [collection
       ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" dictionary {"+" [Dictionary]}]]]]]
+      ["[0]" dictionary {"+" Dictionary}]]]]]
   ["[0]" / "_"
    ["[1][0]" function]
    ["[1][0]" case]
@@ -17,12 +17,12 @@
    ["/[1]" // "_"
     ["[1][0]" extension]
     ["/[1]" // "_"
-     ["[1][0]" analysis {"+" [Analysis]}]
-     ["/" synthesis {"+" [Synthesis Phase]}]
+     ["[1][0]" analysis {"+" Analysis}]
+     ["/" synthesis {"+" Synthesis Phase}]
      [///
       ["[0]" phase ("[1]#[0]" monad)]
-      [reference {"+" []}
-       [variable {"+" []}]]]]]])
+      [reference {"+"}
+       [variable {"+"}]]]]]])
 
 (def: (primitive analysis)
   (-> ///analysis.Primitive /.Primitive)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index 8beed67e5..2c2d1784b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -2,17 +2,17 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     ["[0]" monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     ["[0]" monad {"+" do}]]
     [control
-     [pipe {"+" [when> new> case>]}]]
+     [pipe {"+" when> new> case>}]]
     [data
      ["[0]" product]
      ["[0]" bit ("[1]#[0]" equivalence)]
      ["[0]" text ("[1]#[0]" equivalence)]
      [collection
       ["[0]" list ("[1]#[0]" functor mix monoid)]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [math
      [number
       ["n" nat]
@@ -20,14 +20,14 @@
       ["[0]" frac ("[1]#[0]" equivalence)]]]]]
   ["[0]" /// "_"
    [//
-    ["[1][0]" analysis {"+" [Pattern Match Analysis]}]
-    ["/" synthesis {"+" [Path Synthesis Operation Phase]}]
+    ["[1][0]" analysis {"+" Pattern Match Analysis}]
+    ["/" synthesis {"+" Path Synthesis Operation Phase}]
     [///
      ["[1]" phase ("[1]#[0]" monad)]
      ["[1][0]" reference
-      ["[1]/[0]" variable {"+" [Register Variable]}]]
+      ["[1]/[0]" variable {"+" Register Variable}]]
      [meta
-      [archive {"+" [Archive]}]]]]])
+      [archive {"+" Archive}]]]]])
 
 (def: clean_up
   (-> Path Path)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux
index 347527c3d..7dfef8a48 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/function.lux
@@ -2,29 +2,29 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]
+     ["[0]" monad {"+" do}]
      ["[0]" enum]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" maybe ("[1]#[0]" functor)]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor monoid)]]]
     [math
      [number
       ["n" nat]]]]]
   ["[0]" // "_"
-   ["[1][0]" loop {"+" [Transform]}]
+   ["[1][0]" loop {"+" Transform}]
    ["//[1]" /// "_"
-    ["[1][0]" analysis {"+" [Environment Analysis]}]
-    ["/" synthesis {"+" [Path Abstraction Synthesis Operation Phase]}]
+    ["[1][0]" analysis {"+" Environment Analysis}]
+    ["/" synthesis {"+" Path Abstraction Synthesis Operation Phase}]
     [///
-     [arity {"+" [Arity]}]
+     [arity {"+" Arity}]
      ["[1][0]" reference
-      ["[1]/[0]" variable {"+" [Register Variable]}]]
+      ["[1]/[0]" variable {"+" Register Variable}]]
      ["[0]" phase ("[1]#[0]" monad)]]]])
 
 (exception: .public (cannot_find_foreign_variable_in_environment [foreign Register
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
index eb8f7e4cb..ff6818b83 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/loop.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe ("[1]#[0]" monad)]]
     [data
@@ -12,12 +12,12 @@
      [number
       ["n" nat]]]]]
   [////
-   ["[0]" analysis {"+" [Environment]}]
-   ["/" synthesis {"+" [Path Abstraction Synthesis]}]
+   ["[0]" analysis {"+" Environment}]
+   ["/" synthesis {"+" Path Abstraction Synthesis}]
    [///
-    [arity {"+" [Arity]}]
+    [arity {"+" Arity}]
     ["[0]" reference
-     ["[0]" variable {"+" [Register Variable]}]]]])
+     ["[0]" variable {"+" Register Variable}]]]])
 
 (type: .public (Transform a)
   (-> a (Maybe a)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
index 303671914..b423da2a7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/synthesis/variable.lux
@@ -2,29 +2,29 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe ("[1]#[0]" functor)]
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" product]
      ["[0]" text
       ["%" format]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" list ("[1]#[0]" functor mix)]
       ["[0]" set]]]
     [math
      [number
       ["n" nat]]]]]
   [////
-   ["/" synthesis {"+" [Path Synthesis]}]
+   ["/" synthesis {"+" Path Synthesis}]
    ["[0]" analysis]
    [///
-    [arity {"+" [Arity]}]
+    [arity {"+" Arity}]
     ["[0]" reference
-     ["[0]" variable {"+" [Register Variable]}]]]])
+     ["[0]" variable {"+" Register Variable}]]]])
 
 (def: (prune redundant register)
   (-> Register Register Register)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/program.lux b/stdlib/source/library/lux/tool/compiler/language/lux/program.lux
index fc13a5999..52ebf8d6b 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/program.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/program.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]]]
   [//
-   [generation {"+" [Context]}]
+   [generation {"+" Context}]
    [///
     [meta
-     ["[0]" archive {"+" [Archive]}
-      ["[0]" descriptor {"+" [Module]}]
+     ["[0]" archive {"+" Archive}
+      ["[0]" descriptor {"+" Module}]
       ["[0]" artifact]]]]])
 
 (type: .public (Program expression directive)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
index 340c71298..d9e8a1c99 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/syntax.lux
@@ -32,15 +32,15 @@
      monad]
     [control
      ["[0]" maybe]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      [parser
-      [text {"+" [Offset]}]]]
+      [text {"+" Offset}]]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [macro
      ["[0]" template]]
     [math
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
index 7888c15f3..f310d43cd 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/synthesis.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
-   [lux {"-" [i64 Scope]}
+   [lux {"-" i64 Scope}
     [abstract
-     [monad {"+" [do]}]
-     [equivalence {"+" [Equivalence]}]
-     [hash {"+" [Hash]}]]
+     [monad {"+" do}]
+     [equivalence {"+" Equivalence}]
+     [hash {"+" Hash}]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" maybe]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" sum]
      ["[0]" product]
      ["[0]" bit ("[1]#[0]" equivalence)]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [Format format]}]]
+      ["%" format {"+" Format format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [math
      [number
       ["[0]" i64]
@@ -25,14 +25,14 @@
       ["i" int]
       ["f" frac]]]]]
   [//
-   ["[0]" analysis {"+" [Environment Composite Analysis]}]
+   ["[0]" analysis {"+" Environment Composite Analysis}]
    [phase
-    ["[0]" extension {"+" [Extension]}]]
+    ["[0]" extension {"+" Extension}]]
    [///
-    [arity {"+" [Arity]}]
+    [arity {"+" Arity}]
     ["[0]" phase]
-    ["[0]" reference {"+" [Reference]}
-     ["[0]" variable {"+" [Register Variable]}]]]])
+    ["[0]" reference {"+" Reference}
+     ["[0]" variable {"+" Register Variable}]]]])
 
 (type: .public Resolver
   (Dictionary Variable Variable))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/version.lux b/stdlib/source/library/lux/tool/compiler/language/lux/version.lux
index e472c3a03..1dd8b3e6d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/version.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/version.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"]]
   [////
-   [version {"+" [Version]}]])
+   [version {"+" Version}]])
 
 (def: .public version
   Version
diff --git a/stdlib/source/library/lux/tool/compiler/meta.lux b/stdlib/source/library/lux/tool/compiler/meta.lux
index c15c11ee4..8f660f1de 100644
--- a/stdlib/source/library/lux/tool/compiler/meta.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"]]
   [//
-   [version {"+" [Version]}]])
+   [version {"+" Version}]])
 
 (def: .public version
   Version
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
index 16486e75b..1d9a35692 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
@@ -1,29 +1,29 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     [abstract
-     ["[0]" equivalence {"+" [Equivalence]}]
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" equivalence {"+" Equivalence}]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      ["[0]" function]
      ["<>" parser
-      ["<[0]>" binary {"+" [Parser]}]]]
+      ["<[0]>" binary {"+" Parser}]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" bit]
      ["[0]" product]
      ["[0]" name]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [format
-      ["[0]" binary {"+" [Writer]}]]
+      ["[0]" binary {"+" Writer}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" set]
-      ["[0]" row {"+" [Row]}]]]
+      ["[0]" row {"+" Row}]]]
     [math
      [number
       ["n" nat ("[1]#[0]" equivalence)]]]
@@ -31,12 +31,12 @@
      abstract]]]
   [/
    ["[0]" artifact]
-   ["[0]" signature {"+" [Signature]}]
-   ["[0]" key {"+" [Key]}]
-   ["[0]" descriptor {"+" [Module Descriptor]}]
-   ["[0]" document {"+" [Document]}]
+   ["[0]" signature {"+" Signature}]
+   ["[0]" key {"+" Key}]
+   ["[0]" descriptor {"+" Module Descriptor}]
+   ["[0]" document {"+" Document}]
    [///
-    [version {"+" [Version]}]]])
+    [version {"+" Version}]]])
 
 (type: .public Output
   (Row [artifact.ID (Maybe Text) Binary]))
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux
index 5295241d4..178b8fa4a 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/artifact.lux
@@ -2,22 +2,22 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
-     ["[0]" exception {"+" [exception:]}]
+     [pipe {"+" case>}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" binary {"+" [Parser]}]]]
+      ["<[0]>" binary {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list]
-      ["[0]" row {"+" [Row]} ("[1]#[0]" functor mix)]
-      ["[0]" dictionary {"+" [Dictionary]}]]
+      ["[0]" row {"+" Row} ("[1]#[0]" functor mix)]
+      ["[0]" dictionary {"+" Dictionary}]]
      [format
-      ["[0]" binary {"+" [Writer]}]]]
+      ["[0]" binary {"+" Writer}]]]
     [type
      abstract]]])
 
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/descriptor.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/descriptor.lux
index 622cf2d59..9ec41c54b 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/descriptor.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/descriptor.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     [control
      ["<>" parser
-      ["<b>" binary {"+" [Parser]}]]]
+      ["<b>" binary {"+" Parser}]]]
     [data
      ["[0]" text]
      [collection
-      [set {"+" [Set]}]]
+      [set {"+" Set}]]
      [format
-      ["[0]" binary {"+" [Writer]}]]]
+      ["[0]" binary {"+" Writer}]]]
     [world
-     [file {"+" [Path]}]]]]
+     [file {"+" Path}]]]]
   [//
-   ["[0]" artifact {"+" [Registry]}]])
+   ["[0]" artifact {"+" Registry}]])
 
 (type: .public Module
   Text)
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/document.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/document.lux
index bbb14191a..0df391ab4 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/document.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/document.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      [binary {"+" [Parser]}]]]
+      [binary {"+" Parser}]]]
     [data
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]]
+      ["[0]" dictionary {"+" Dictionary}]]
      [format
-      ["[0]" binary {"+" [Writer]}]]]
-    [type {"+" [:sharing]}
+      ["[0]" binary {"+" Writer}]]]
+    [type {"+" :sharing}
      abstract]]]
   [//
-   ["[0]" signature {"+" [Signature]}]
-   ["[0]" key {"+" [Key]}]
-   [descriptor {"+" [Module]}]])
+   ["[0]" signature {"+" Signature}]
+   ["[0]" key {"+" Key}]
+   [descriptor {"+" Module}]])
 
 (exception: .public (invalid_signature [expected Signature
                                         actual Signature])
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux
index 034e61388..c1e56c7a8 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/key.lux
@@ -4,7 +4,7 @@
     [type
      abstract]]]
   [//
-   [signature {"+" [Signature]}]])
+   [signature {"+" Signature}]])
 
 (abstract: .public (Key k)
   Signature
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux
index 2ad3b7b96..ccc605ef2 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/signature.lux
@@ -2,22 +2,22 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]]
+     [equivalence {"+" Equivalence}]]
     [control
      ["<>" parser
-      ["<b>" binary {"+" [Parser]}]]]
+      ["<b>" binary {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" name]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [format
-      ["[0]" binary {"+" [Writer]}]]]
+      ["[0]" binary {"+" Writer}]]]
     [math
      [number
       ["[0]" nat]]]]]
   [////
-   [version {"+" [Version]}]])
+   [version {"+" Version}]])
 
 (type: .public Signature
   (Record
diff --git a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency.lux b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency.lux
index a7bc82364..953b23605 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/cache/dependency.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/cache/dependency.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux {"-" [Module]}
+   [lux {"-" Module}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe ("[1]#[0]" functor)]
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      ["[0]" state]
      ["[0]" function
-      ["[0]" memo {"+" [Memo]}]]]
+      ["[0]" memo {"+" Memo}]]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
-      ["[0]" dictionary {"+" [Dictionary]}]
-      ["[0]" set {"+" [Set]}]]]]]
+      ["[0]" dictionary {"+" Dictionary}]
+      ["[0]" set {"+" Set}]]]]]
   [///
-   ["[0]" archive {"+" [Output Archive]}
-    [key {"+" [Key]}]
-    ["[0]" descriptor {"+" [Module Descriptor]}]
-    ["[0]" document {"+" [Document]}]]])
+   ["[0]" archive {"+" Output Archive}
+    [key {"+" Key}]
+    ["[0]" descriptor {"+" Module Descriptor}]
+    ["[0]" document {"+" Document}]]])
 
 (type: Ancestry
   (Set Module))
diff --git a/stdlib/source/library/lux/tool/compiler/meta/io.lux b/stdlib/source/library/lux/tool/compiler/meta/io.lux
index 0dc406820..aae2226d3 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
-   [lux {"-" [Code]}
+   [lux {"-" Code}
     [data
      ["[0]" text]]
     [world
-     [file {"+" [Path System]}]]]])
+     [file {"+" Path System}]]]])
 
 (type: .public Context
   Path)
diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
index 11b6414f6..f54bca93b 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/archive.lux
@@ -1,27 +1,27 @@
 (.module:
   [library
-   [lux {"-" [Module]}
-    [target {"+" [Target]}]
+   [lux {"-" Module}
+    [target {"+" Target}]
     [abstract
-     [predicate {"+" [Predicate]}]
-     ["[0]" monad {"+" [do]}]]
+     [predicate {"+" Predicate}]
+     ["[0]" monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     [pipe {"+" case>}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      [concurrency
-      ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]
+      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]
      ["<>" parser
-      ["<[0]>" binary {"+" [Parser]}]]]
+      ["<[0]>" binary {"+" Parser}]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
-      ["[0]" dictionary {"+" [Dictionary]}]
-      ["[0]" row {"+" [Row]}]
+      ["[0]" dictionary {"+" Dictionary}]
+      ["[0]" row {"+" Row}]
       ["[0]" set]]]
     [math
      [number
@@ -30,18 +30,18 @@
      ["[0]" file]]]]
   [program
    [compositor
-    [import {"+" [Import]}]
-    ["[0]" static {"+" [Static]}]]]
-  ["[0]" // {"+" [Context]}
+    [import {"+" Import}]
+    ["[0]" static {"+" Static}]]]
+  ["[0]" // {"+" Context}
    ["[1][0]" context]
    ["/[1]" //
-    ["[0]" archive {"+" [Output Archive]}
-     ["[0]" artifact {"+" [Artifact]}]
-     ["[0]" descriptor {"+" [Module Descriptor]}]
-     ["[0]" document {"+" [Document]}]]
+    ["[0]" archive {"+" Output Archive}
+     ["[0]" artifact {"+" Artifact}]
+     ["[0]" descriptor {"+" Module Descriptor}]
+     ["[0]" document {"+" Document}]]
     [cache
      ["[0]" dependency]]
-    ["/[1]" // {"+" [Input]}
+    ["/[1]" // {"+" Input}
      [language
       ["$" lux
        ["[0]" version]
diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux
index 95a122edd..04830e5b2 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux
@@ -1,35 +1,35 @@
 (.module:
   [library
-   [lux {"-" [Module Code]}
+   [lux {"-" Module Code}
     ["@" target]
     [abstract
-     [predicate {"+" [Predicate]}]
-     ["[0]" monad {"+" [Monad do]}]]
+     [predicate {"+" Predicate}]
+     ["[0]" monad {"+" Monad do}]]
     [control
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      [concurrency
-      ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]]
+      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" list]]]
     [world
      ["[0]" file]]]]
   [program
    [compositor
-    [import {"+" [Import]}]]]
-  ["[0]" // {"+" [Context Code]}
+    [import {"+" Import}]]]
+  ["[0]" // {"+" Context Code}
    ["/[1]" // "_"
     [archive
-     [descriptor {"+" [Module]}]]
-    ["/[1]" // {"+" [Input]}]]])
+     [descriptor {"+" Module}]]
+    ["/[1]" // {"+" Input}]]])
 
 (exception: .public (cannot_find_module [importer Module
                                          module Module])
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager.lux b/stdlib/source/library/lux/tool/compiler/meta/packager.lux
index 86e5af12b..1b96d7b64 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager.lux
@@ -2,11 +2,11 @@
   [library
    [lux "*"
     [control
-     [try {"+" [Try]}]]
+     [try {"+" Try}]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      [collection
-      [dictionary {"+" [Dictionary]}]
+      [dictionary {"+" Dictionary}]
       ["[0]" row]
       ["[0]" list ("[1]#[0]" functor)]]]
     [world
@@ -14,13 +14,13 @@
   [//
    [cache
     ["[0]" dependency]]
-   ["[0]" archive {"+" [Archive]}
+   ["[0]" archive {"+" Archive}
     ["[0]" descriptor]
     ["[0]" artifact]]
    [//
     [language
      [lux
-      [generation {"+" [Context]}]]]]])
+      [generation {"+" Context}]]]]])
 
 (type: .public Packager
   (-> (Dictionary file.Path Binary)
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
index 10433ddf5..0e8c265c7 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/jvm.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux {"-" [Module Definition]}
-    ["[0]" ffi {"+" [import: do_to]}]
+   [lux {"-" Module Definition}
+    ["[0]" ffi {"+" import: do_to}]
     [abstract
-     ["[0]" monad {"+" [Monad do]}]]
+     ["[0]" monad {"+" Monad do}]]
     [control
      ["[0]" maybe ("[1]#[0]" functor)]
-     ["[0]" try {"+" [Try]}]]
+     ["[0]" try {"+" Try}]]
     [data
-     ["[0]" binary {"+" [Binary]}]
+     ["[0]" binary {"+" Binary}]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" row]
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" dictionary]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [math
      [number
       ["n" nat]
@@ -28,11 +28,11 @@
      ["[0]" file]]]]
   [program
    [compositor
-    ["[0]" static {"+" [Static]}]]]
-  ["[0]" // {"+" [Packager]}
+    ["[0]" static {"+" Static}]]]
+  ["[0]" // {"+" Packager}
    [//
-    ["[0]" archive {"+" [Output]}
-     ["[0]" descriptor {"+" [Module]}]
+    ["[0]" archive {"+" Output}
+     ["[0]" descriptor {"+" Module}]
      ["[0]" artifact]]
     [cache
      ["[0]" dependency]]
@@ -41,11 +41,11 @@
     [//
      [language
       ["$" lux
-       [generation {"+" [Context]}]
+       [generation {"+" Context}]
        [phase
         [generation
          [jvm
-          ["[0]" runtime {"+" [Definition]}]]]]]]]]])
+          ["[0]" runtime {"+" Definition}]]]]]]]]])
 
 (import: java/lang/Object)
 
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux
index 0b7857b58..d9380b3d3 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/scheme.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux {"-" [Module]}
-    [type {"+" [:sharing]}]
+   [lux {"-" Module}
+    [type {"+" :sharing}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]]
+     ["[0]" try {"+" Try}]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       ["[0]" encoding]]
      [collection
       ["[0]" row]
       ["[0]" list ("[1]#[0]" functor mix)]
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" set]]
      [format
       ["[0]" tar]
@@ -23,18 +23,18 @@
     [target
      ["_" scheme]]
     [time
-     ["[0]" instant {"+" [Instant]}]]
+     ["[0]" instant {"+" Instant}]]
     [world
      ["[0]" file]]]]
   [program
    [compositor
-    ["[0]" static {"+" [Static]}]]]
-  ["[0]" // {"+" [Packager]}
+    ["[0]" static {"+" Static}]]]
+  ["[0]" // {"+" Packager}
    [//
-    ["[0]" archive {"+" [Output]}
-     ["[0]" descriptor {"+" [Module Descriptor]}]
+    ["[0]" archive {"+" Output}
+     ["[0]" descriptor {"+" Module Descriptor}]
      ["[0]" artifact]
-     ["[0]" document {"+" [Document]}]]
+     ["[0]" document {"+" Document}]]
     [cache
      ["[0]" dependency]]
     ["[0]" io "_"
@@ -42,7 +42,7 @@
     [//
      [language
       ["$" lux
-       [generation {"+" [Context]}]]]]]])
+       [generation {"+" Context}]]]]]])
 
 ... TODO: Delete ASAP
 (type: (Action ! a)
diff --git a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux
index 8399ce409..2476f3c6c 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/packager/script.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
    [lux "*"
-    [type {"+" [:sharing]}]
+    [type {"+" :sharing}]
     [abstract
-     ["[0]" monad {"+" [Monad do]}]]
+     ["[0]" monad {"+" Monad do}]]
     [control
-     ["[0]" try {"+" [Try]}]]
+     ["[0]" try {"+" Try}]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding 
        ["[0]" utf8]]]
      [collection
@@ -18,10 +18,10 @@
       ["[0]" list ("[1]#[0]" functor)]]]]]
   [program
    [compositor
-    ["[0]" static {"+" [Static]}]]]
-  ["[0]" // {"+" [Packager]}
+    ["[0]" static {"+" Static}]]]
+  ["[0]" // {"+" Packager}
    [//
-    ["[0]" archive {"+" [Output]}
+    ["[0]" archive {"+" Output}
      ["[0]" descriptor]
      ["[0]" artifact]]
     [cache
@@ -31,7 +31,7 @@
     [//
      [language
       ["$" lux
-       [generation {"+" [Context]}]]]]]])
+       [generation {"+" Context}]]]]]])
 
 (def: (write_module sequence [module output] so_far)
   (All (_ directive)
diff --git a/stdlib/source/library/lux/tool/compiler/phase.lux b/stdlib/source/library/lux/tool/compiler/phase.lux
index 7140df44f..fc4851b5d 100644
--- a/stdlib/source/library/lux/tool/compiler/phase.lux
+++ b/stdlib/source/library/lux/tool/compiler/phase.lux
@@ -3,26 +3,26 @@
    [lux "*"
     ["[0]" debug]
     [abstract
-     [monad {"+" [Monad do]}]]
+     [monad {"+" Monad do}]]
     [control
      ["[0]" state]
-     ["[0]" try {"+" [Try]} ("[1]#[0]" functor)]
-     ["ex" exception {"+" [Exception exception:]}]
+     ["[0]" try {"+" Try} ("[1]#[0]" functor)]
+     ["ex" exception {"+" Exception exception:}]
      ["[0]" io]
      [parser
       ["<[0]>" code]]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [time
      ["[0]" instant]
      ["[0]" duration]]
     [macro
-     [syntax {"+" [syntax:]}]]]]
+     [syntax {"+" syntax:}]]]]
   [//
    [meta
-    [archive {"+" [Archive]}]]])
+    [archive {"+" Archive}]]])
 
 (type: .public (Operation s o)
   (state.+State Try s o))
diff --git a/stdlib/source/library/lux/tool/compiler/reference.lux b/stdlib/source/library/lux/tool/compiler/reference.lux
index 91d80c4a7..c5adb07f3 100644
--- a/stdlib/source/library/lux/tool/compiler/reference.lux
+++ b/stdlib/source/library/lux/tool/compiler/reference.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux {"-" [local]}
+   [lux {"-" local}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [hash {"+" [Hash]}]]
+     [equivalence {"+" Equivalence}]
+     [hash {"+" Hash}]]
     [control
-     [pipe {"+" [case>]}]]
+     [pipe {"+" case>}]]
     [data
      ["[0]" name]
      [text
-      ["%" format {"+" [Format]}]]]
+      ["%" format {"+" Format}]]]
     [math
      [number
       ["n" nat]]]]]
   ["[0]" / "_"
-   ["[1][0]" variable {"+" [Variable]}]])
+   ["[1][0]" variable {"+" Variable}]])
 
 (type: .public Constant
   Name)
diff --git a/stdlib/source/library/lux/tool/compiler/reference/variable.lux b/stdlib/source/library/lux/tool/compiler/reference/variable.lux
index 99b9d0e9b..002c892cd 100644
--- a/stdlib/source/library/lux/tool/compiler/reference/variable.lux
+++ b/stdlib/source/library/lux/tool/compiler/reference/variable.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [hash {"+" [Hash]}]]
+     [equivalence {"+" Equivalence}]
+     [hash {"+" Hash}]]
     [control
-     [pipe {"+" [case>]}]]
+     [pipe {"+" case>}]]
     [data
      [text
-      ["%" format {"+" [Format]}]]]
+      ["%" format {"+" Format}]]]
     [math
      [number
       ["n" nat]