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

21 files changed, 189 insertions, 188 deletions

diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index 272faea29..7b1b35b52 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -1,35 +1,35 @@
 (.module:
   [library
-   [lux {"-" [Type static local]}
-    ["[0]" ffi {"+" [Inheritance Privacy State import:]}]
+   [lux {"-" Type static local}
+    ["[0]" ffi {"+" Inheritance Privacy State import:}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
-     ["[0]" try {"+" [Try]}]
+     [pipe {"+" case>}]
+     ["[0]" try {"+" Try}]
      ["<>" parser
-      ["<[0]>" code {"+" [Parser]}]
+      ["<[0]>" code {"+" Parser}]
       ["<[0]>" text]]]
     [data
-     [identity {"+" [Identity]}]
-     [binary {"+" [Binary]}]
+     [identity {"+" Identity}]
+     [binary {"+" Binary}]
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      [array {"+" [Array]}]
+      [array {"+" Array}]
       ["[0]" list ("[1]#[0]" mix functor monoid)]
-      ["[0]" dictionary {"+" [Dictionary]}]
-      ["[0]" row {"+" [Row]} ("[1]#[0]" functor mix)]]]
+      ["[0]" dictionary {"+" Dictionary}]
+      ["[0]" row {"+" Row} ("[1]#[0]" functor mix)]]]
     [math
      [number
       ["[0]" nat]]]
     [target
      ["/" jvm
       [encoding
-       ["[0]" name {"+" [External]}]]
-      ["[1][0]" type {"+" [Type Constraint]}
-       [category {"+" [Void Value Return Primitive Object Class Var Parameter]}]
+       ["[0]" name {"+" External}]]
+      ["[1][0]" type {"+" Type Constraint}
+       [category {"+" Void Value Return Primitive Object Class Var Parameter}]
        ["[0]" parser]
        ["[0]T" lux]
        ["[1]/[0]" signature]
@@ -39,10 +39,10 @@
       ["[0]" phase]
       [language
        [lux
-        ["[0]" analysis {"+" [Analysis]}]
-        ["[0]" synthesis {"+" [Synthesis]}]
+        ["[0]" analysis {"+" Analysis}]
+        ["[0]" synthesis {"+" Synthesis}]
         ["[0]" generation]
-        ["[0]" directive {"+" [Requirements]}]
+        ["[0]" directive {"+" Requirements}]
         [phase
          [analysis
           ["[0]A" scope]
@@ -54,10 +54,10 @@
           [directive
            ["[0]/" lux]]]]]]
       [meta
-       [archive {"+" [Archive]}]]]]]]
+       [archive {"+" Archive}]]]]]]
   [///
    [host
-    ["[0]" jvm {"+" [Inst]}
+    ["[0]" jvm {"+" Inst}
      ["_" inst]
      ["[0]" def]]]
    [translation
diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index 8977c374c..600f26dd7 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -1,32 +1,32 @@
 (.module:
   [library
-   [lux {"-" [Definition Type Label]}
-    [ffi {"+" [import:]}]
+   [lux {"-" Definition Type Label}
+    [ffi {"+" import:}]
     [abstract
      monad]
     [control
      ["<>" parser
       ["<[0]>" code]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      [collection
       ["[0]" list ("[1]#[0]" monad)]]]
     [macro
      ["[0]" code]
-     [syntax {"+" [syntax:]}]]
+     [syntax {"+" syntax:}]]
     [target
      [jvm
-      ["[0]" type {"+" [Type]}
-       [category {"+" [Class]}]]]]
+      ["[0]" type {"+" Type}
+       [category {"+" Class}]]]]
     [tool
      [compiler
       [reference
-       [variable {"+" [Register]}]]
+       [variable {"+" Register}]]
       [language
        [lux
         ["[0]" generation]]]
       [meta
-       [archive {"+" [Archive]}]]]]]])
+       [archive {"+" Archive}]]]]]])
 
 (import: org/objectweb/asm/MethodVisitor)
 
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index 4aa88ff9a..e1e7e3c7c 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux {"-" [Type]}
-    ["[0]" ffi {"+" [import: do_to]}]
+   [lux {"-" Type}
+    ["[0]" ffi {"+" import: do_to}]
     [control
      ["[0]" function]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" array {"+" [Array]}]
+      ["[0]" array {"+" Array}]
       ["[0]" list ("[1]@[0]" functor)]]]
     [math
      [number
@@ -18,8 +18,8 @@
      [jvm
       [encoding
        ["[0]" name]]
-      ["[0]" type {"+" [Type Constraint]}
-       [category {"+" [Class Value Method]}]
+      ["[0]" type {"+" Type Constraint}
+       [category {"+" Class Value Method}]
        ["[0]" signature]
        ["[0]" descriptor]]]]]]
   ["[0]" //])
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 64113cd68..1ac0a61cc 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [Type int char try]}
-    ["[0]" ffi {"+" [import: do_to]}]
+   [lux {"-" Type int char try}
+    ["[0]" ffi {"+" import: do_to}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" function]
      ["[0]" maybe]
@@ -15,7 +15,7 @@
      [collection
       ["[0]" list ("[1]@[0]" functor)]]]
     [macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]
      ["[0]" template]]
     [math
@@ -25,16 +25,16 @@
     [target
      [jvm
       [encoding
-       ["[0]" name {"+" [External]}]]
-      ["[0]" type {"+" [Type]} ("[1]@[0]" equivalence)
-       [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter]}]
+       ["[0]" name {"+" External}]]
+      ["[0]" type {"+" Type} ("[1]@[0]" equivalence)
+       [category {"+" Void Value Return Method Primitive Object Class Array Var Parameter}]
        ["[0]" box]
        ["[0]" descriptor]
        ["[0]" reflection]]]]
     [tool
      [compiler
-      [phase {"+" [Operation]}]]]]]
-  ["[0]" // {"+" [Inst]}])
+      [phase {"+" Operation}]]]]]
+  ["[0]" // {"+" Inst}])
 
 (def: class_name (|>> type.descriptor descriptor.class_name name.read))
 (def: descriptor (|>> type.descriptor descriptor.descriptor))
diff --git a/lux-jvm/source/luxc/lang/synthesis/variable.lux b/lux-jvm/source/luxc/lang/synthesis/variable.lux
index f580ceec7..927ec84e3 100644
--- a/lux-jvm/source/luxc/lang/synthesis/variable.lux
+++ b/lux-jvm/source/luxc/lang/synthesis/variable.lux
@@ -6,7 +6,7 @@
                    ["s" set])))
   (luxc (lang ["la" analysis]
               ["ls" synthesis]
-              ["[0]L" variable {"+" [Variable]}])))
+              ["[0]L" variable {"+" Variable}])))
 
 (def: (bound-vars path)
   (-> ls.Path (List Variable))
diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index 1da7db420..b3ae09176 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -1,28 +1,28 @@
 (.module:
   [library
-   [lux {"-" [Module Definition]}
-    ["[0]" ffi {"+" [import: do_to object]}]
+   [lux {"-" Module Definition}
+    ["[0]" ffi {"+" import: do_to object}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      pipe
      ["[0]" maybe]
-     ["[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}]]]
     [target
      [jvm
-      ["[0]" loader {"+" [Library]}]
+      ["[0]" loader {"+" Library}]
       ["[0]" type
        ["[0]" descriptor]]]]
     [tool
@@ -32,13 +32,13 @@
         ["[0]" version]
         ["[0]" generation]]]
       [meta
-       [io {"+" [lux_context]}]
+       [io {"+" lux_context}]
        [archive
-        [descriptor {"+" [Module]}]
+        [descriptor {"+" Module}]
         ["[0]" artifact]]]]]]]
   [///
    [host
-    ["[0]" jvm {"+" [Inst Definition Host State]}
+    ["[0]" jvm {"+" Inst Definition Host State}
      ["[0]" def]
      ["[0]" inst]]]]
   )
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/case.lux b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
index 04a9571a9..032b058df 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/case.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux {"-" [Type Label if let case]}
+   [lux {"-" Type Label if let case}
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]
-     ["ex" exception {"+" [exception:]}]]
+     ["ex" exception {"+" exception:}]]
     [data
      [collection
       ["[0]" list ("[1]@[0]" mix)]]]
@@ -14,22 +14,22 @@
       ["n" nat]]]
     [target
      [jvm
-      ["[0]" type {"+" [Type]}
-       ["[0]" category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]
-       ["[0]" descriptor {"+" [Descriptor]}]
-       ["[0]" signature {"+" [Signature]}]]]]
+      ["[0]" type {"+" Type}
+       ["[0]" category {"+" Void Value Return Primitive Object Class Array Var Parameter Method}]
+       ["[0]" descriptor {"+" Descriptor}]
+       ["[0]" signature {"+" Signature}]]]]
     [tool
      [compiler
       ["[0]" phase ("operation@[0]" monad)]
       [meta
-       [archive {"+" [Archive]}]]
+       [archive {"+" Archive}]]
       [language
        [lux
-        ["[0]" synthesis {"+" [Path Synthesis]}]]]]]]]
+        ["[0]" synthesis {"+" Path Synthesis}]]]]]]]
   [luxc
    [lang
     [host
-     ["$" jvm {"+" [Label Inst Operation Phase Generator]}
+     ["$" jvm {"+" Label Inst Operation Phase Generator}
       ["_" inst]]]]]
   ["[0]" //
    ["[0]" runtime]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/common.lux
index 642f5f83e..57f3ee822 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/common.lux
@@ -1,26 +1,27 @@
 (.module:
   [library
-   [lux "*"
-    ... [abstract
-    ...  [monad {"+" [do]}]]
-    ... [control
-    ...  ["[0]" try {"+" [Try]}]
-    ...  ["ex" exception {"+" [exception:]}]
-    ...  ["[0]" io]]
-    ... [data
-    ...  [binary {"+" [Binary]}]
-    ...  ["[0]" text {"+" [\n]} ("[1]#[0]" hash)
-    ...   format]
-    ...  [collection
-    ...   ["[0]" dictionary {"+" [Dictionary]}]]]
-    ... ["[0]" macro]
-    ... [host {"+" [import:]}]
-    ... [tool
-    ...  [compiler
-    ...   [reference {"+" [Register]}]
-    ...   ["[0]" name]
-    ...   ["[0]" phase]]]
-    ]]
+   ... [lux "*"
+   ...  [abstract
+   ...   [monad {"+" do}]]
+   ...  [control
+   ...   ["[0]" try {"+" Try}]
+   ...   ["ex" exception {"+" exception:}]
+   ...   ["[0]" io]]
+   ...  [data
+   ...   [binary {"+" Binary}]
+   ...   ["[0]" text {"+" \n} ("[1]#[0]" hash)
+   ...    format]
+   ...   [collection
+   ...    ["[0]" dictionary {"+" Dictionary}]]]
+   ...  ["[0]" macro]
+   ...  [host {"+" import:}]
+   ...  [tool
+   ...   [compiler
+   ...    [reference {"+" Register}]
+   ...    ["[0]" name]
+   ...    ["[0]" phase]]]
+   ...  ]
+   ]
   ... [luxc
   ...  [lang
   ...   [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/expression.lux b/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
index 55e81812d..c2dfe0ace 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/expression.lux
@@ -11,7 +11,7 @@
   [luxc
    [lang
     [host
-     [jvm {"+" [Phase]}]]]]
+     [jvm {"+" Phase}]]]]
   [//
    ["[0]" common]
    ["[0]" primitive]
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
index fff364f52..8ebacd941 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension.lux
@@ -6,7 +6,7 @@
       ["[0]" dictionary]]]]]
   [////
    [host
-    [jvm {"+" [Bundle]}]]]
+    [jvm {"+" Bundle}]]]
   ["[0]" / "_"
    ["[1][0]" common]
    ["[1][0]" host]])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
index 78048379c..79eeb98b5 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/common.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux {"-" [Type Label]}
-    [ffi {"+" [import:]}]
+   [lux {"-" Type Label}
+    [ffi {"+" import:}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" try]
      ["<>" parser
-      ["<s>" synthesis {"+" [Parser]}]]]
+      ["<s>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      [collection
@@ -23,20 +23,20 @@
      [compiler
       ["[0]" phase]
       [meta
-       [archive {"+" [Archive]}]]
+       [archive {"+" Archive}]]
       [language
        [lux
-        ["[0]" synthesis {"+" [Synthesis %synthesis]}]
+        ["[0]" synthesis {"+" Synthesis %synthesis}]
         [phase
          [generation
-          [extension {"+" [Nullary Unary Binary Trinary Variadic
-                           nullary unary binary trinary variadic]}]]
+          [extension {"+" Nullary Unary Binary Trinary Variadic
+                      nullary unary binary trinary variadic}]]
          ["[0]" extension
           ["[0]" bundle]]]]]]]]]
   [luxc
    [lang
     [host
-     ["$" jvm {"+" [Label Inst Def Handler Bundle Operation Phase]}
+     ["$" jvm {"+" Label Inst Def Handler Bundle Operation Phase}
       ["_" inst]]]]]
   ["[0]" ///
    ["[0]" runtime]])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
index 3120b66b4..137633847 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/extension/host.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
-   [lux {"-" [Type Label primitive int char type]}
-    [ffi {"+" [import:]}]
+   [lux {"-" Type Label primitive int char type}
+    [ffi {"+" import:}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe ("[1]#[0]" functor)]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["[0]" function]
      ["<>" parser ("[1]#[0]" monad)
       ["<[0]>" text]
-      ["<[0]>" synthesis {"+" [Parser]}]]]
+      ["<[0]>" synthesis {"+" Parser}]]]
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" monad mix)]
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" set]]]
     [macro
      ["[0]" template]]
@@ -26,8 +26,8 @@
       ["n" nat]]]
     [target
      [jvm
-      ["[0]" type {"+" [Type Typed Argument]}
-       ["[0]" category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]
+      ["[0]" type {"+" Type Typed Argument}
+       ["[0]" category {"+" Void Value Return Primitive Object Class Array Var Parameter Method}]
        ["[0]" box]
        ["[0]" reflection]
        ["[0]" signature]
@@ -36,19 +36,19 @@
     [tool
      [compiler
       ["[0]" phase ("[1]#[0]" monad)]
-      [reference {"+" []}
-       ["[0]" variable {"+" [Variable Register]}]]
+      [reference {"+" }
+       ["[0]" variable {"+" Variable Register}]]
       [meta
-       [archive {"+" [Archive]}]]
+       [archive {"+" Archive}]]
       [language
        [lux
-        [analysis {"+" [Environment]}]
-        ["[0]" synthesis {"+" [Synthesis Path %synthesis]}]
+        [analysis {"+" Environment}]
+        ["[0]" synthesis {"+" Synthesis Path %synthesis}]
         ["[0]" generation]
         [phase
          [generation
-          [extension {"+" [Nullary Unary Binary
-                           nullary unary binary]}]]
+          [extension {"+" Nullary Unary Binary
+                      nullary unary binary}]]
          [analysis
           ["[0]A" reference]]
          ["[0]" extension
@@ -58,11 +58,11 @@
   [luxc
    [lang
     [host
-     ["$" jvm {"+" [Label Inst Def Handler Bundle Operation Phase]}
+     ["$" jvm {"+" Label Inst Def Handler Bundle Operation Phase}
       ["_" inst]
       ["_[0]" def]]]]]
   ["[0]" // "_"
-   [common {"+" [custom]}]
+   [common {"+" custom}]
    ["/[1]" //
     ["[1][0]" reference]
     ["[1][0]" function]]])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index 458683ec2..fc8670946 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux {"-" [Type Label function]}
+   [lux {"-" Type Label function}
     [abstract
-     ["[0]" monad {"+" [do]}]
+     ["[0]" monad {"+" do}]
      ["[0]" enum]]
     [control
-     [pipe {"+" [when> new>]}]
+     [pipe {"+" when> new>}]
      ["[0]" function]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]@[0]" functor monoid)]]]
     [math
@@ -19,25 +19,25 @@
       ["i" int]]]
     [target
      [jvm
-      ["[0]" type {"+" [Type]}
-       ["[0]" category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]]]]
+      ["[0]" type {"+" Type}
+       ["[0]" category {"+" Void Value Return Primitive Object Class Array Var Parameter Method}]]]]
     [tool
      [compiler
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[0]" phase]
       [reference
-       [variable {"+" [Register]}]]
+       [variable {"+" Register}]]
       [language
        [lux
-        [analysis {"+" [Environment]}]
-        [synthesis {"+" [Synthesis Abstraction Apply]}]
-        ["[0]" generation {"+" [Context]}]]]
+        [analysis {"+" Environment}]
+        [synthesis {"+" Synthesis Abstraction Apply}]
+        ["[0]" generation {"+" Context}]]]
       [meta
-       [archive {"+" [Archive]}]]]]]]
+       [archive {"+" Archive}]]]]]]
   [luxc
    [lang
     [host
-     ["$" jvm {"+" [Label Inst Def Operation Phase Generator]}
+     ["$" jvm {"+" Label Inst Def Operation Phase Generator}
       ["[0]" def]
       ["_" inst]]]]]
   ["[0]" //
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
index 7d037280d..ad0b41e4e 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/loop.lux
@@ -2,7 +2,7 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" function]]
     [data
@@ -15,15 +15,15 @@
      [compiler
       ["[0]" phase]
       [reference
-       [variable {"+" [Register]}]]
+       [variable {"+" Register}]]
       [language
        [lux
-        ["[0]" synthesis {"+" [Synthesis]}]
+        ["[0]" synthesis {"+" Synthesis}]
         ["[0]" generation]]]]]]]
   [luxc
    [lang
     [host
-     [jvm {"+" [Inst Operation Phase Generator]}
+     [jvm {"+" Inst Operation Phase Generator}
       ["_" inst]]]]]
   ["[0]" //])
 
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
index 1e93db481..b598f1d35 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
@@ -1,7 +1,7 @@
 (.module:
   [library
-   [lux {"-" [i64]}
-    ["[0]" ffi {"+" [import:]}]
+   [lux {"-" i64}
+    ["[0]" ffi {"+" import:}]
     [math
      [number
       ["i" int]]]
@@ -14,7 +14,7 @@
   [luxc
    [lang
     [host
-     ["[0]" jvm {"+" [Inst Operation]}
+     ["[0]" jvm {"+" Inst Operation}
       ["_" inst]]]]])
 
 (def: .public bit
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/program.lux b/lux-jvm/source/luxc/lang/translation/jvm/program.lux
index 266938286..8523e30f2 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/program.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/program.lux
@@ -3,7 +3,7 @@
    [lux "*"
     [data
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
      [jvm
       ["$t" type]]]
@@ -11,8 +11,8 @@
      [compiler
       [language
        [lux
-        [generation {"+" [Context]}]
-        [program {"+" [Program]}]]]]]]]
+        [generation {"+" Context}]
+        [program {"+" Program}]]]]]]]
   [luxc
    [lang
     [host
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/reference.lux b/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
index aebd84a60..62be103e5 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/reference.lux
@@ -1,28 +1,28 @@
 (.module:
   [library
-   [lux {"-" [local]}
+   [lux {"-" local}
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [target
      [jvm
       ["[0]" type]]]
     [tool
      [compiler
       [reference
-       ["[0]" variable {"+" [Register Variable]}]]
+       ["[0]" variable {"+" Register Variable}]]
       ["[0]" phase ("operation@[0]" monad)]
       [meta
-       [archive {"+" [Archive]}]]
+       [archive {"+" Archive}]]
       [language
        [lux
         ["[0]" generation]]]]]]]
   [luxc
    [lang
     [host
-     [jvm {"+" [Inst Operation]}
+     [jvm {"+" Inst Operation}
       ["_" inst]]]]]
   ["[0]" //
    ["[1][0]" runtime]])
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
index 995d82e47..cb62ddb4b 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/runtime.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux {"-" [Type Label try]}
+   [lux {"-" Type Label try}
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      ["[0]" enum]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]@[0]" functor)]
       ["[0]" row]]]
@@ -17,27 +17,27 @@
       ["n" nat]]]
     [target
      [jvm
-      ["[0]" type {"+" [Type]}
-       ["[0]" category {"+" [Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method]}]
+      ["[0]" type {"+" Type}
+       ["[0]" category {"+" Void Value' Value Return' Return Primitive Object Class Array Var Parameter Method}]
        ["[0]" reflection]]]]
     [tool
      [compiler
-      [arity {"+" [Arity]}]
+      [arity {"+" Arity}]
       ["[0]" phase]
       [language
        [lux
         ["[0]" synthesis]
         ["[0]" generation]]]
       [meta
-       [archive {"+" [Output]}
-        ["[0]" artifact {"+" [Registry]}]]]]]]]
+       [archive {"+" Output}
+        ["[0]" artifact {"+" Registry}]]]]]]]
   [luxc
    [lang
     [host
-     ["$" jvm {"+" [Label Inst Def Operation]}
+     ["$" jvm {"+" Label Inst Def Operation}
       ["$d" def]
       ["_" inst]]]]]
-  ["[0]" // {"+" [ByteCode]}])
+  ["[0]" // {"+" ByteCode}])
 
 (def: $Text (type.class "java.lang.String" (list)))
 (def: .public $Lefts type.int)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index 3f113e83d..bccdf5ec0 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux {"-" [Type]}
-    ["[0]" ffi {"+" [import:]}]
+   [lux {"-" Type}
+    ["[0]" ffi {"+" import:}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list]]]
     [math
@@ -17,22 +17,22 @@
       ["i" int]]]
     [target
      [jvm
-      ["[0]" type {"+" [Type]}
-       ["[0]" category {"+" [Void Value Return Primitive Object Class Array Var Parameter Method]}]
-       ["[0]" descriptor {"+" [Descriptor]}]
-       ["[0]" signature {"+" [Signature]}]]]]
+      ["[0]" type {"+" Type}
+       ["[0]" category {"+" Void Value Return Primitive Object Class Array Var Parameter Method}]
+       ["[0]" descriptor {"+" Descriptor}]
+       ["[0]" signature {"+" Signature}]]]]
     [tool
      [compiler
       ["[0]" phase]
       [meta
-       [archive {"+" [Archive]}]]
+       [archive {"+" Archive}]]
       [language
        [lux
-        [synthesis {"+" [Synthesis]}]]]]]]]
+        [synthesis {"+" Synthesis}]]]]]]]
   [luxc
    [lang
     [host
-     [jvm {"+" [Inst Operation Phase Generator]}
+     [jvm {"+" Inst Operation Phase Generator}
       ["_" inst]]]]]
   ["[0]" //
    ["[1][0]" runtime]])
diff --git a/lux-jvm/source/program.lux b/lux-jvm/source/program.lux
index 254f99e8b..4484db653 100644
--- a/lux-jvm/source/program.lux
+++ b/lux-jvm/source/program.lux
@@ -1,49 +1,49 @@
 (.module:
   [library
-   [lux {"-" [Definition]}
-    [program {"+" [program:]}]
+   [lux {"-" Definition}
+    [program {"+" program:}]
     ["@" target]
-    ["[0]" ffi {"+" [import:]}]
+    ["[0]" ffi {"+" import:}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" io {"+" [IO]}]
-     ["[0]" try {"+" [Try]}]
+     ["[0]" io {"+" IO}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      [array {"+" [Array]}]
+      [array {"+" Array}]
       ["[0]" dictionary]]]
     ["[0]" world "_"
      ["[0]" file]
      ["[1]/[0]" program]]
     [target
      ["[0]" jvm "_"
-      [bytecode {"+" [Bytecode]}]
+      [bytecode {"+" Bytecode}]
       ["[1]/[0]" type
        ["[1]/[0]" box]]]]
     [tool
      [compiler
-      [reference {"+" []}]
+      [reference {"+" }]
       ["[0]" phase]
       [default
-       ["[0]" platform {"+" [Platform]}]]
+       ["[0]" platform {"+" Platform}]]
       [meta
-       [archive {"+" [Archive]}]
+       [archive {"+" Archive}]
        ["[0]" packager "_"
         ["[1]" jvm]]]
       [language
        [lux
-        ["$" synthesis {"+" [Synthesis]}]
+        ["$" synthesis {"+" Synthesis}]
         ["[0]" generation]
         [analysis
-         [macro {"+" [Expander]}]]
+         [macro {"+" Expander}]]
         [phase
-         [extension {"+" [Phase Bundle Operation Handler Extender]}
+         [extension {"+" Phase Bundle Operation Handler Extender}
           ["[0]" analysis "_"
            ["[1]" jvm]]
           ... ["[0]" generation "_"
diff --git a/lux-jvm/source/test/program.lux b/lux-jvm/source/test/program.lux
index 0d306ffef..cbce7b97e 100644
--- a/lux-jvm/source/test/program.lux
+++ b/lux-jvm/source/test/program.lux
@@ -1,10 +1,10 @@
 (.module:
   [lux "*"
-   ["_" test {"+" [Test]}]
+   ["_" test {"+" Test}]
    [control
     ["[0]" io]
     [parser
-     [cli {"+" [program:]}]]]]
+     [cli {"+" program:}]]]]
   [spec
    ["[0]" compositor]]
   [\\