De-taggification | part 2

46 files changed, 378 insertions, 378 deletions

diff --git a/stdlib/source/library/lux/target/common_lisp.lux b/stdlib/source/library/lux/target/common_lisp.lux
index 9714e7743..d57cb51c9 100644
--- a/stdlib/source/library/lux/target/common_lisp.lux
+++ b/stdlib/source/library/lux/target/common_lisp.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux (#- Code int if cond or and comment let)
+   [lux {"-" [Code int if cond or and comment let]}
     [control
-     [pipe (#+ case> cond> new>)]]
+     [pipe {"+" [case> cond> new>]}]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." monad monoid)]]]
     [macro
diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux
index 62ce204c5..fc1257fdc 100644
--- a/stdlib/source/library/lux/target/js.lux
+++ b/stdlib/source/library/lux/target/js.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux (#- Location Code Label or and function if cond undefined for comment not int try ++ --)
+   [lux {"-" [Location Code Label or and function if cond undefined for comment not int try ++ --]}
     [control
-     [pipe (#+ case>)]]
+     [pipe {"+" [case>]}]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor mix)]]]
     [macro
diff --git a/stdlib/source/library/lux/target/jvm.lux b/stdlib/source/library/lux/target/jvm.lux
index 50543961c..8da4679fc 100644
--- a/stdlib/source/library/lux/target/jvm.lux
+++ b/stdlib/source/library/lux/target/jvm.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux (#- Type Label)
+   [lux {"-" [Type Label]}
     [data
      [collection
-      [row (#+ Row)]]]
+      [row {"+" [Row]}]]]
     [target
      [jvm
-      [type (#+ Type)
-       ["." category (#+ Primitive Class Value Method)]]]]]])
+      [type {"+" [Type]}
+       ["." category {"+" [Primitive Class Value Method]}]]]]]])
 
 (type: .public Literal
   (Variant
diff --git a/stdlib/source/library/lux/target/jvm/attribute.lux b/stdlib/source/library/lux/target/jvm/attribute.lux
index 45758f54f..053c59e3f 100644
--- a/stdlib/source/library/lux/target/jvm/attribute.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute.lux
@@ -1,28 +1,28 @@
 (.module:
   [library
-   [lux (#- Info Code)
+   [lux {"-" [Info Code]}
     [abstract
-     [monad (#+ do)]
-     ["." equivalence (#+ Equivalence)]]
+     [monad {"+" [do]}]
+     ["." equivalence {"+" [Equivalence]}]]
     [control
      ["." try]
-     ["." exception (#+ exception:)]]
+     ["." exception {"+" [exception:]}]]
     [data
      ["." sum]
      ["." product]
      [format
-      [".F" binary (#+ Writer)]]]
+      [".F" binary {"+" [Writer]}]]]
     [math
      [number
       ["n" nat]]]]]
-  ["." // #_
-   ["#." index (#+ Index)]
+  ["." // "_"
+   ["#." index {"+" [Index]}]
    [encoding
-    ["#." unsigned (#+ U2 U4)]]
-   ["#." constant (#+ UTF8 Class Value)
-    ["#/." pool (#+ Pool Resource)]]]
-  ["." / #_
-   ["#." constant (#+ Constant)]
+    ["#." unsigned {"+" [U2 U4]}]]
+   ["#." constant {"+" [UTF8 Class Value]}
+    ["#/." pool {"+" [Pool Resource]}]]]
+  ["." / "_"
+   ["#." constant {"+" [Constant]}]
    ["#." code]])
 
 (type: .public (Info about)
diff --git a/stdlib/source/library/lux/target/jvm/attribute/code.lux b/stdlib/source/library/lux/target/jvm/attribute/code.lux
index 207ddf022..eec5e8233 100644
--- a/stdlib/source/library/lux/target/jvm/attribute/code.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/code.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux (#- Code)
+   [lux {"-" [Code]}
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
      ["." product]
-     ["." binary (#+ Binary)]
+     ["." binary {"+" [Binary]}]
      [format
-      [".F" binary (#+ Writer) ("#\." monoid)]]
+      [".F" binary {"+" [Writer]} ("#\." monoid)]]
      [collection
-      ["." row (#+ Row) ("#\." functor mix)]]]
+      ["." row {"+" [Row]} ("#\." functor mix)]]]
     [math
      [number
       ["n" nat]]]]]
-  ["." /// #_
+  ["." /// "_"
    [bytecode
     [environment
-     ["#." limit (#+ Limit)]]]
+     ["#." limit {"+" [Limit]}]]]
    [encoding
-    ["#." unsigned (#+ U2)]]]
-  ["." / #_
-   ["#." exception (#+ Exception)]])
+    ["#." unsigned {"+" [U2]}]]]
+  ["." / "_"
+   ["#." exception {"+" [Exception]}]])
 
 (type: .public (Code Attribute)
   (Record
diff --git a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux
index 6bdf8dfff..97cda5be3 100644
--- a/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/code/exception.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
      ["." product]
-     ["." format #_
-      ["#" binary (#+ Writer)]]]
+     ["." format "_"
+      ["#" binary {"+" [Writer]}]]]
     [math
      [number
       ["n" nat]]]]]
-  ["." // #_
-   ["//#" /// #_
-    [constant (#+ Class)]
-    ["#." index (#+ Index)]
+  ["." // "_"
+   ["//#" /// "_"
+    [constant {"+" [Class]}]
+    ["#." index {"+" [Index]}]
     [bytecode
-     ["#." address (#+ Address)]]
+     ["#." address {"+" [Address]}]]
     [encoding
-     ["#." unsigned (#+ U2)]]]])
+     ["#." unsigned {"+" [U2]}]]]])
 
 (type: .public Exception
   (Record
diff --git a/stdlib/source/library/lux/target/jvm/attribute/constant.lux b/stdlib/source/library/lux/target/jvm/attribute/constant.lux
index d9242dc89..1f03b9162 100644
--- a/stdlib/source/library/lux/target/jvm/attribute/constant.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/constant.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
      [format
-      [binary (#+ Writer)]]]]]
-  ["." /// #_
-   [constant (#+ Value)]
-   ["#." index (#+ Index)]
+      [binary {"+" [Writer]}]]]]]
+  ["." /// "_"
+   [constant {"+" [Value]}]
+   ["#." index {"+" [Index]}]
    [encoding
-    ["#." unsigned (#+ U2 U4)]]])
+    ["#." unsigned {"+" [U2 U4]}]]])
 
 (type: .public (Constant a)
   (Index (Value a)))
diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux
index 0cb111e13..bb0c14d64 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode.lux
@@ -1,53 +1,53 @@
 (.module:
   [library
-   [lux (#- Type Label int try)
-    ["." ffi (#+ import:)]
+   [lux {"-" [Type Label int try]}
+    ["." ffi {"+" [import:]}]
     [abstract
-     [monoid (#+ Monoid)]
-     ["." monad (#+ Monad do)]]
+     [monoid {"+" [Monoid]}]
+     ["." monad {"+" [Monad do]}]]
     [control
-     ["." writer (#+ Writer)]
-     ["." state (#+ +State)]
+     ["." writer {"+" [Writer]}]
+     ["." state {"+" [+State]}]
      ["." function]
      ["." maybe]
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]]
     [data
      ["." product]
      [text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor mix)]
-      ["." dictionary (#+ Dictionary)]
-      ["." row (#+ Row)]]]
+      ["." dictionary {"+" [Dictionary]}]
+      ["." row {"+" [Row]}]]]
     [macro
      ["." template]]
     [math
      [number
       ["n" nat]
       ["i" int]
-      ["." i32 (#+ I32)]]]]]
-  ["." / #_
-   ["#." address (#+ Address)]
-   ["#." jump (#+ Jump Big_Jump)]
-   ["_" instruction (#+ Primitive_Array_Type Instruction Estimator) ("#\." monoid)]
-   ["#." environment (#+ Environment)
+      ["." i32 {"+" [I32]}]]]]]
+  ["." / "_"
+   ["#." address {"+" [Address]}]
+   ["#." jump {"+" [Jump Big_Jump]}]
+   ["_" instruction {"+" [Primitive_Array_Type Instruction Estimator]} ("#\." monoid)]
+   ["#." environment {"+" [Environment]}
     [limit
-     ["/." registry (#+ Register Registry)]
-     ["/." stack (#+ Stack)]]]
-   ["/#" // #_
-    ["#." index (#+ Index)]
+     ["/." registry {"+" [Register Registry]}]
+     ["/." stack {"+" [Stack]}]]]
+   ["/#" // "_"
+    ["#." index {"+" [Index]}]
     [encoding
      ["#." name]
-     ["#." unsigned (#+ U1 U2)]
-     ["#." signed (#+ S1 S2 S4)]]
-    ["#." constant (#+ UTF8)
-     ["#/." pool (#+ Pool Resource)]]
+     ["#." unsigned {"+" [U1 U2]}]
+     ["#." signed {"+" [S1 S2 S4]}]]
+    ["#." constant {"+" [UTF8]}
+     ["#/." pool {"+" [Pool Resource]}]]
     [attribute
      [code
-      ["#." exception (#+ Exception)]]]
-    ["." type (#+ Type)
-     [category (#+ Class Object Value' Value Return' Return Method)]
+      ["#." exception {"+" [Exception]}]]]
+    ["." type {"+" [Type]}
+     [category {"+" [Class Object Value' Value Return' Return Method]}]
      ["." reflection]
      ["." parser]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/address.lux b/stdlib/source/library/lux/target/jvm/bytecode/address.lux
index 51ab13080..302fbcc8e 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/address.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/address.lux
@@ -1,27 +1,27 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]]
+     ["." try {"+" [Try]}]]
     [data
      [format
-      [binary (#+ Writer)]]
+      [binary {"+" [Writer]}]]
      [text
-      ["%" format (#+ Format)]]]
+      ["%" format {"+" [Format]}]]]
     [math
      [number
       ["n" nat]]]
     [type
      abstract]]]
-  ["." // #_
-   [jump (#+ Big_Jump)]
-   ["/#" // #_
+  ["." // "_"
+   [jump {"+" [Big_Jump]}]
+   ["/#" // "_"
     [encoding
-     ["#." unsigned (#+ U2)]
-     ["#." signed (#+ S4)]]]])
+     ["#." unsigned {"+" [U2]}]
+     ["#." signed {"+" [S4]}]]]])
 
 (abstract: .public Address
   {}
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux
index 2bf2c5c31..ade32b3d4 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/environment.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux (#- Type static)
+   [lux {"-" [Type static]}
     [abstract
-     [monad (#+ do)]
-     [monoid (#+ Monoid)]]
+     [monad {"+" [do]}]
+     [monoid {"+" [Monoid]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]]]]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]]]]
   [/
-   ["/." limit (#+ Limit)
-    ["/." stack (#+ Stack)]
-    ["/." registry (#+ Registry)]]
+   ["/." limit {"+" [Limit]}
+    ["/." stack {"+" [Stack]}]
+    ["/." registry {"+" [Registry]}]]
    [///
     [encoding
-     [unsigned (#+ U2)]]
-    [type (#+ Type)
-     [category (#+ Method)]]]])
+     [unsigned {"+" [U2]}]]
+    [type {"+" [Type]}
+     [category {"+" [Method]}]]]])
 
 (type: .public Environment
   (Record
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux
index 4ab466ae4..faac0819b 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux (#- Type static)
+   [lux {"-" [Type static]}
     [abstract
-     [monad (#+ do)]
-     [equivalence (#+ Equivalence)]]
+     [monad {"+" [do]}]
+     [equivalence {"+" [Equivalence]}]]
     [control
-     ["." try (#+ Try)]]
+     ["." try {"+" [Try]}]]
     [data
      ["." product]
-     ["." format #_
-      ["#" binary (#+ Writer) ("#\." monoid)]]]
+     ["." format "_"
+      ["#" binary {"+" [Writer]} ("#\." monoid)]]]
     [math
      [number
       ["n" nat]]]]]
-  ["." / #_
-   ["#." stack (#+ Stack)]
-   ["#." registry (#+ Registry)]
+  ["." / "_"
+   ["#." stack {"+" [Stack]}]
+   ["#." registry {"+" [Registry]}]
    [////
-    [type (#+ Type)
-     [category (#+ Method)]]]])
+    [type {"+" [Type]}
+     [category {"+" [Method]}]]]])
 
 (type: .public Limit
   (Record
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux
index 04bf00456..e2fa1461f 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/registry.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux (#- Type for static)
+   [lux {"-" [Type for static]}
     [abstract
-     ["." equivalence (#+ Equivalence)]]
+     ["." equivalence {"+" [Equivalence]}]]
     [control
-     ["." try (#+ Try) ("#\." functor)]]
+     ["." try {"+" [Try]} ("#\." functor)]]
     [data
      [format
-      [binary (#+ Writer)]]
+      [binary {"+" [Writer]}]]
      [collection
       ["." list ("#\." functor mix)]]]
     [math
@@ -15,11 +15,11 @@
       ["n" nat]]]
     [type
      abstract]]]
-  ["." ///// #_
+  ["." ///// "_"
    [encoding
-    ["#." unsigned (#+ U1 U2)]]
-   ["#." type (#+ Type)
-    [category (#+ Method)]
+    ["#." unsigned {"+" [U1 U2]}]]
+   ["#." type {"+" [Type]}
+    [category {"+" [Method]}]
     ["#/." parser]]])
 
 (type: .public Register
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux
index 13d4b5137..396c972c5 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/environment/limit/stack.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     ["." equivalence (#+ Equivalence)]]
+     ["." equivalence {"+" [Equivalence]}]]
     [control
      ["." maybe]
-     ["." try (#+ Try)]]
+     ["." try {"+" [Try]}]]
     [data
      [text
-      ["%" format (#+ Format)]]
+      ["%" format {"+" [Format]}]]
      [format
-      [binary (#+ Writer)]]]
+      [binary {"+" [Writer]}]]]
     [type
      abstract]]]
-  ["." ///// #_
+  ["." ///// "_"
    [encoding
-    ["#." unsigned (#+ U2)]]])
+    ["#." unsigned {"+" [U2]}]]])
 
 (abstract: .public Stack
   {}
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
index bba0c67da..effbdda4a 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
@@ -1,40 +1,40 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]
-     [monoid (#+ Monoid)]]
+     [monad {"+" [do]}]
+     [monoid {"+" [Monoid]}]]
     [control
      ["." function]
      ["." try]]
     [data
      ["." product]
      ["." binary]
-     ["." format #_
-      ["#" binary (#+ Mutation Specification)]]
+     ["." format "_"
+      ["#" binary {"+" [Mutation Specification]}]]
      [collection
       ["." list]]]
     [macro
      ["." template]]
     [math
-     [number (#+ hex)
+     [number {"+" [hex]}
       ["n" nat]]]
     [type
      abstract]]]
-  ["." // #_
-   ["#." address (#+ Address)]
-   ["#." jump (#+ Jump Big_Jump)]
+  ["." // "_"
+   ["#." address {"+" [Address]}]
+   ["#." jump {"+" [Jump Big_Jump]}]
    [environment
     [limit
-     [registry (#+ Register)]]]
-   ["/#" // #_
-    ["#." index (#+ Index)]
-    ["#." constant (#+ Class Reference)]
+     [registry {"+" [Register]}]]]
+   ["/#" // "_"
+    ["#." index {"+" [Index]}]
+    ["#." constant {"+" [Class Reference]}]
     [encoding
-     ["#." unsigned (#+ U1 U2 U4)]
-     ["#." signed (#+ S1 S2 S4)]]
+     ["#." unsigned {"+" [U1 U2 U4]}]
+     ["#." signed {"+" [S1 S2 S4]}]]
     [type
-     [category (#+ Value Method)]]]])
+     [category {"+" [Value Method]}]]]])
 
 (type: .public Size
   U2)
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux
index 4b908d990..615b7f9ac 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/jump.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/jump.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
-     ["." format #_
-      ["#" binary (#+ Writer)]]]]]
-  ["." /// #_
+     ["." format "_"
+      ["#" binary {"+" [Writer]}]]]]]
+  ["." /// "_"
    [encoding
-    ["#." signed (#+ S2 S4)]]])
+    ["#." signed {"+" [S2 S4]}]]])
 
 (type: .public Jump
   S2)
diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux
index 1dae89e90..72bdce14e 100644
--- a/stdlib/source/library/lux/target/jvm/class.lux
+++ b/stdlib/source/library/lux/target/jvm/class.lux
@@ -1,31 +1,31 @@
 (.module:
   [library
-   [lux (#- public private)
+   [lux {"-" [public private]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     ["." monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     ["." monad {"+" [do]}]]
     [control
      ["." state]
-     ["." try (#+ Try)]]
+     ["." try {"+" [Try]}]]
     [data
      ["." product]
      [format
-      [".F" binary (#+ Writer) ("#\." monoid)]]
+      [".F" binary {"+" [Writer]} ("#\." monoid)]]
      [collection
-      ["." row (#+ Row)]]]]]
-  ["." // #_
-   ["#." modifier (#+ Modifier modifiers:)]
-   ["#." version (#+ Version Minor Major)]
-   ["#." magic (#+ Magic)]
-   ["#." index (#+ Index)]
-   ["#." attribute (#+ Attribute)]
-   ["#." field (#+ Field)]
-   ["#." method (#+ Method)]
+      ["." row {"+" [Row]}]]]]]
+  ["." // "_"
+   ["#." modifier {"+" [Modifier modifiers:]}]
+   ["#." version {"+" [Version Minor Major]}]
+   ["#." magic {"+" [Magic]}]
+   ["#." index {"+" [Index]}]
+   ["#." attribute {"+" [Attribute]}]
+   ["#." field {"+" [Field]}]
+   ["#." method {"+" [Method]}]
    [encoding
     ["#." unsigned]
-    ["#." name (#+ Internal)]]
-   ["#." constant (#+ Constant)
-    ["#/." pool (#+ Pool Resource)]]])
+    ["#." name {"+" [Internal]}]]
+   ["#." constant {"+" [Constant]}
+    ["#/." pool {"+" [Pool Resource]}]]])
 
 (type: .public Class
   (Rec Class
diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux
index 780816d70..82e4c49e1 100644
--- a/stdlib/source/library/lux/target/jvm/constant.lux
+++ b/stdlib/source/library/lux/target/jvm/constant.lux
@@ -1,36 +1,36 @@
 (.module:
   [library
-   [lux #*
-    ["." ffi (#+ import:)]
+   [lux "*"
+    ["." ffi {"+" [import:]}]
     ["@" target]
     [abstract
-     [monad (#+ do)]
-     ["." equivalence (#+ Equivalence)]]
+     [monad {"+" [do]}]
+     ["." equivalence {"+" [Equivalence]}]]
     [data
      ["." sum]
      ["." product]
      ["." text]
      [format
-      [".F" binary (#+ Writer) ("#\." monoid)]]
+      [".F" binary {"+" [Writer]} ("#\." monoid)]]
      [collection
-      ["." row (#+ Row)]]]
+      ["." row {"+" [Row]}]]]
     [macro
      ["." template]]
     [math
      [number
-      ["." i32 (#+ I32)]
+      ["." i32 {"+" [I32]}]
       ["." i64]
       ["." int]
       ["." frac]]]
     [type
      abstract]]]
-  ["." / #_
+  ["." / "_"
    ["#." tag]
-   ["/#" // #_
-    ["#." index (#+ Index)]
+   ["/#" // "_"
+    ["#." index {"+" [Index]}]
     [type
      ["#." category]
-     ["#." descriptor (#+ Descriptor)]]
+     ["#." descriptor {"+" [Descriptor]}]]
     [encoding
      ["#." unsigned]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/constant/pool.lux b/stdlib/source/library/lux/target/jvm/constant/pool.lux
index a680980ef..7bdb7d977 100644
--- a/stdlib/source/library/lux/target/jvm/constant/pool.lux
+++ b/stdlib/source/library/lux/target/jvm/constant/pool.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     ["." ffi]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ Monad do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [Monad do]}]]
     [control
-     ["." state (#+ +State)]
-     ["." try (#+ Try)]]
+     ["." state {"+" [+State]}]
+     ["." try {"+" [Try]}]]
     [data
      ["." product]
      ["." text]
-     ["." format #_
-      ["#" binary (#+ Writer) ("specification\." monoid)]]
+     ["." format "_"
+      ["#" binary {"+" [Writer]} ("specification\." monoid)]]
      [collection
-      ["." row (#+ Row) ("#\." mix)]]]
+      ["." row {"+" [Row]} ("#\." mix)]]]
     [macro
      ["." template]]
     [math
@@ -25,15 +25,15 @@
       ["." frac]]]
     [type
      abstract]]]
-  ["." // (#+ UTF8 String Class Integer Float Long Double Constant Name_And_Type Reference)
+  ["." // {"+" [UTF8 String Class Integer Float Long Double Constant Name_And_Type Reference]}
    [//
     [encoding
-     ["#." name (#+ Internal External)]
+     ["#." name {"+" [Internal External]}]
      ["#." unsigned]]
-    ["#." index (#+ Index)]
+    ["#." index {"+" [Index]}]
     [type
-     [category (#+ Value Method)]
-     ["#." descriptor (#+ Descriptor)]]]])
+     [category {"+" [Value Method]}]
+     ["#." descriptor {"+" [Descriptor]}]]]])
 
 (type: .public Pool
   [Index (Row [Index Constant])])
diff --git a/stdlib/source/library/lux/target/jvm/constant/tag.lux b/stdlib/source/library/lux/target/jvm/constant/tag.lux
index 54b4dbba1..75afcd52c 100644
--- a/stdlib/source/library/lux/target/jvm/constant/tag.lux
+++ b/stdlib/source/library/lux/target/jvm/constant/tag.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [control
      ["." try]]
     [data
      [format
-      [binary (#+ Writer)]]]
+      [binary {"+" [Writer]}]]]
     [type
      abstract]]]
-  ["." /// #_
+  ["." /// "_"
    [encoding
-    ["#." unsigned (#+ U1) ("u1//." equivalence)]]])
+    ["#." unsigned {"+" [U1]} ("u1//." equivalence)]]])
 
 (abstract: .public Tag
   {}
diff --git a/stdlib/source/library/lux/target/jvm/encoding/name.lux b/stdlib/source/library/lux/target/jvm/encoding/name.lux
index eb232aaba..b515e1d6b 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/name.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/name.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [type
      abstract]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/target/jvm/encoding/signed.lux
index 5a687eaba..abd02e3d8 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/signed.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/signed.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux (#- int)
+   [lux {"-" [int]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     [order (#+ Order)]]
+     [equivalence {"+" [Equivalence]}]
+     [order {"+" [Order]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]]
     [data
      [text
-      ["%" format (#+ format)]]
-     ["." format #_
-      ["#" binary (#+ Writer)]]]
+      ["%" format {"+" [format]}]]
+     ["." format "_"
+      ["#" binary {"+" [Writer]}]]]
     [macro
      ["." template]]
     [math
diff --git a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
index 2b38774f5..6d0f259cb 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux (#- nat)
+   [lux {"-" [nat]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     [order (#+ Order)]]
+     [equivalence {"+" [Equivalence]}]
+     [order {"+" [Order]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]]
     [data
      [text
-      ["%" format (#+ format)]]
-     ["." format #_
-      ["#" binary (#+ Writer)]]]
+      ["%" format {"+" [format]}]]
+     ["." format "_"
+      ["#" binary {"+" [Writer]}]]]
     [macro
      ["." template]]
     [math
diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux
index a709da105..b3f41c3f1 100644
--- a/stdlib/source/library/lux/target/jvm/field.lux
+++ b/stdlib/source/library/lux/target/jvm/field.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux (#- Type static public private)
+   [lux {"-" [Type static public private]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     ["." monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     ["." monad {"+" [do]}]]
     [data
      ["." product]
      [format
-      [".F" binary (#+ Writer) ("#\." monoid)]]
+      [".F" binary {"+" [Writer]} ("#\." monoid)]]
      [collection
-      ["." row (#+ Row)]]]]]
-  ["." // #_
-   ["." modifier (#+ Modifier modifiers:)]
-   ["#." constant (#+ UTF8)
-    ["#/." pool (#+ Pool Resource)]]
-   ["#." index (#+ Index)]
-   ["#." attribute (#+ Attribute)]
-   ["#." type (#+ Type)
-    [category (#+ Value)]
-    [descriptor (#+ Descriptor)]]])
+      ["." row {"+" [Row]}]]]]]
+  ["." // "_"
+   ["." modifier {"+" [Modifier modifiers:]}]
+   ["#." constant {"+" [UTF8]}
+    ["#/." pool {"+" [Pool Resource]}]]
+   ["#." index {"+" [Index]}]
+   ["#." attribute {"+" [Attribute]}]
+   ["#." type {"+" [Type]}
+    [category {"+" [Value]}]
+    [descriptor {"+" [Descriptor]}]]])
 
 (type: .public Field
   (Rec Field
diff --git a/stdlib/source/library/lux/target/jvm/index.lux b/stdlib/source/library/lux/target/jvm/index.lux
index 5651ac589..178586d44 100644
--- a/stdlib/source/library/lux/target/jvm/index.lux
+++ b/stdlib/source/library/lux/target/jvm/index.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     ["." equivalence (#+ Equivalence)]]
+     ["." equivalence {"+" [Equivalence]}]]
     [data
      [format
-      [binary (#+ Writer)]]]
+      [binary {"+" [Writer]}]]]
     [type
      abstract]]]
-  ["." // #_
+  ["." // "_"
    [encoding
-    ["#." unsigned (#+ U2)]]])
+    ["#." unsigned {"+" [U2]}]]])
 
 (def: .public length
   //unsigned.bytes/2)
diff --git a/stdlib/source/library/lux/target/jvm/loader.lux b/stdlib/source/library/lux/target/jvm/loader.lux
index daae8ca9a..511dd9c39 100644
--- a/stdlib/source/library/lux/target/jvm/loader.lux
+++ b/stdlib/source/library/lux/target/jvm/loader.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     ["@" target]
-    ["." ffi (#+ import: object do_to)]
+    ["." ffi {"+" [import: object do_to]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]
-     ["." io (#+ IO)]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]
+     ["." io {"+" [IO]}]
      [concurrency
-      ["." atom (#+ Atom)]]]
+      ["." atom {"+" [Atom]}]]]
     [data
-     ["." binary (#+ Binary)]
+     ["." binary {"+" [Binary]}]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." array]
-      ["." dictionary (#+ Dictionary)]]]]])
+      ["." dictionary {"+" [Dictionary]}]]]]])
 
 (type: .public Library
   (Atom (Dictionary Text Binary)))
diff --git a/stdlib/source/library/lux/target/jvm/magic.lux b/stdlib/source/library/lux/target/jvm/magic.lux
index b2b547fcf..a29a6a73b 100644
--- a/stdlib/source/library/lux/target/jvm/magic.lux
+++ b/stdlib/source/library/lux/target/jvm/magic.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [control
      ["." try]]
     [math
-     [number (#+ hex)]]]]
-  ["." // #_
+     [number {"+" [hex]}]]]]
+  ["." // "_"
    [encoding
-    ["#." unsigned (#+ U4)]]])
+    ["#." unsigned {"+" [U4]}]]])
 
 (type: .public Magic
   U4)
diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux
index 638d4091f..b3a4a811c 100644
--- a/stdlib/source/library/lux/target/jvm/method.lux
+++ b/stdlib/source/library/lux/target/jvm/method.lux
@@ -1,30 +1,30 @@
 (.module:
   [library
-   [lux (#- Type static public private)
+   [lux {"-" [Type static public private]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     ["." monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     ["." monad {"+" [do]}]]
     [control
      ["." try]]
     [data
      ["." product]
-     ["." format #_
-      ["#" binary (#+ Writer) ("#\." monoid)]]
+     ["." format "_"
+      ["#" binary {"+" [Writer]} ("#\." monoid)]]
      [collection
-      ["." row (#+ Row)]]]]]
-  ["." // #_
-   ["#." modifier (#+ Modifier modifiers:)]
-   ["#." index (#+ Index)]
-   ["#." attribute (#+ Attribute)
+      ["." row {"+" [Row]}]]]]]
+  ["." // "_"
+   ["#." modifier {"+" [Modifier modifiers:]}]
+   ["#." index {"+" [Index]}]
+   ["#." attribute {"+" [Attribute]}
     ["#/." code]]
-   ["#." constant (#+ UTF8)
-    ["#/." pool (#+ Pool Resource)]]
-   ["#." bytecode (#+ Bytecode)
-    ["#/." environment (#+ Environment)]
+   ["#." constant {"+" [UTF8]}
+    ["#/." pool {"+" [Pool Resource]}]]
+   ["#." bytecode {"+" [Bytecode]}
+    ["#/." environment {"+" [Environment]}]
     ["#/." instruction]]
-   ["#." type (#+ Type)
+   ["#." type {"+" [Type]}
     ["#/." category]
-    ["#." descriptor (#+ Descriptor)]]])
+    ["#." descriptor {"+" [Descriptor]}]]])
 
 (type: .public Method
   (Rec Method
diff --git a/stdlib/source/library/lux/target/jvm/modifier.lux b/stdlib/source/library/lux/target/jvm/modifier.lux
index b50127bc2..86a63b6fe 100644
--- a/stdlib/source/library/lux/target/jvm/modifier.lux
+++ b/stdlib/source/library/lux/target/jvm/modifier.lux
@@ -1,25 +1,25 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     ["." equivalence (#+ Equivalence)]
-     ["." monoid (#+ Monoid)]]
+     ["." equivalence {"+" [Equivalence]}]
+     ["." monoid {"+" [Monoid]}]]
     [control
      ["." try]
      ["<>" parser
       ["<.>" code]]]
     [data
      [format
-      [".F" binary (#+ Writer)]]]
-    [macro (#+ with_identifiers)
-     [syntax (#+ syntax:)]
+      [".F" binary {"+" [Writer]}]]]
+    [macro {"+" [with_identifiers]}
+     [syntax {"+" [syntax:]}]
      ["." code]]
     [math
-     ["." number (#+ hex)
+     ["." number {"+" [hex]}
       ["." i64]]]
     [type
      abstract]]]
-  ["." // #_
+  ["." // "_"
    [encoding
     ["#." unsigned]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/modifier/inner.lux b/stdlib/source/library/lux/target/jvm/modifier/inner.lux
index 6a7e9ae7c..a3777c380 100644
--- a/stdlib/source/library/lux/target/jvm/modifier/inner.lux
+++ b/stdlib/source/library/lux/target/jvm/modifier/inner.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux (#- static)
+   [lux {"-" [static]}
     [type
      abstract]]]
-  [// (#+ modifiers:)])
+  [// {"+" [modifiers:]}])
 
 (abstract: .public Inner {} Any)
 
diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux
index dfb2ff5d1..d6b899aab 100644
--- a/stdlib/source/library/lux/target/jvm/reflection.lux
+++ b/stdlib/source/library/lux/target/jvm/reflection.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux (#- type)
-    ["." ffi (#+ import:)]
+   [lux {"-" [type]}
+    ["." ffi {"+" [import:]}]
     ["." type]
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]
      [parser
       ["<t>" text]]]
     [data
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." mix functor)]
       ["." array]
@@ -20,12 +20,12 @@
     [math
      [number
       ["n" nat]]]]]
-  ["." // #_
+  ["." // "_"
    [encoding
-    ["#." name (#+ External)]]
+    ["#." name {"+" [External]}]]
    ["/" type
-    [category (#+ Void Value Return Method Primitive Object Class Array Parameter)]
-    ["#." lux (#+ Mapping)]
+    [category {"+" [Void Value Return Method Primitive Object Class Array Parameter]}]
+    ["#." lux {"+" [Mapping]}]
     ["#." descriptor]
     ["#." reflection]
     ["#." parser]]])
diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux
index 55c6bd921..eb3bece00 100644
--- a/stdlib/source/library/lux/target/jvm/type.lux
+++ b/stdlib/source/library/lux/target/jvm/type.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux (#- Type int char)
+   [lux {"-" [Type int char]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     [hash (#+ Hash)]]
+     [equivalence {"+" [Equivalence]}]
+     [hash {"+" [Hash]}]]
     [control
      ["." maybe]]
     [data
      ["." text
-      ["%" format (#+ Format)]]
+      ["%" format {"+" [Format]}]]
      [collection
       ["." list ("#\." functor)]]]
     [math
@@ -16,14 +16,14 @@
       ["n" nat]]]
     [type
      abstract]]]
-  ["." // #_
+  ["." // "_"
    [encoding
-    ["#." name (#+ External)]]]
-  ["." / #_
-   [category (#+ Void Value' Value Return' Return Method Primitive Object Class Array Var Parameter Declaration)]
-   ["#." signature (#+ Signature)]
-   ["#." descriptor (#+ Descriptor)]
-   ["#." reflection (#+ Reflection)]])
+    ["#." name {"+" [External]}]]]
+  ["." / "_"
+   [category {"+" [Void Value' Value Return' Return Method Primitive Object Class Array Var Parameter Declaration]}]
+   ["#." signature {"+" [Signature]}]
+   ["#." descriptor {"+" [Descriptor]}]
+   ["#." reflection {"+" [Reflection]}]])
 
 (abstract: .public (Type category)
   {}
diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux
index 20f0b2921..cff9f623c 100644
--- a/stdlib/source/library/lux/target/jvm/type/alias.lux
+++ b/stdlib/source/library/lux/target/jvm/type/alias.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux (#- Type int char type primitive)
+   [lux {"-" [Type int char type primitive]}
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
      ["." maybe]
      ["." try]
-     ["." exception (#+ exception:)]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" text {"+" [Parser]}]]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]]]]]
-  ["." // (#+ Type)
-   [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
+      ["." dictionary {"+" [Dictionary]}]]]]]
+  ["." // {"+" [Type]}
+   [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter]}]
    ["#." descriptor]
-   ["#." signature (#+ Signature)]
+   ["#." signature {"+" [Signature]}]
    ["#." reflection]
    ["#." parser]
-   ["/#" // #_
+   ["/#" // "_"
     [encoding
      ["#." name]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/type/box.lux b/stdlib/source/library/lux/target/jvm/type/box.lux
index 44ab2a6ee..4029aaa28 100644
--- a/stdlib/source/library/lux/target/jvm/type/box.lux
+++ b/stdlib/source/library/lux/target/jvm/type/box.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux (#- int char)]]
+   [lux {"-" [int char]}]]
   [///
    [encoding
-    [name (#+ External)]]])
+    [name {"+" [External]}]]])
 
 (template [<name> <box>]
   [(def: .public <name> External <box>)]
diff --git a/stdlib/source/library/lux/target/jvm/type/category.lux b/stdlib/source/library/lux/target/jvm/type/category.lux
index c42a007f2..d4ddd056f 100644
--- a/stdlib/source/library/lux/target/jvm/type/category.lux
+++ b/stdlib/source/library/lux/target/jvm/type/category.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [macro
      ["." template]]
     [type
diff --git a/stdlib/source/library/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/target/jvm/type/descriptor.lux
index 851213003..9d0cc7813 100644
--- a/stdlib/source/library/lux/target/jvm/type/descriptor.lux
+++ b/stdlib/source/library/lux/target/jvm/type/descriptor.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux (#- int char)
+   [lux {"-" [int char]}
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [control
      ["." maybe]]
     [data
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor)]]]
     [math
@@ -15,11 +15,11 @@
       ["n" nat]]]
     [type
      abstract]]]
-  ["." // #_
-   [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
-   ["/#" // #_
+  ["." // "_"
+   [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter Declaration]}]
+   ["/#" // "_"
     [encoding
-     ["#." name (#+ Internal External)]]]])
+     ["#." name {"+" [Internal External]}]]]])
 
 (abstract: .public (Descriptor category)
   {}
diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux
index 1e44c7a25..eacb25024 100644
--- a/stdlib/source/library/lux/target/jvm/type/lux.lux
+++ b/stdlib/source/library/lux/target/jvm/type/lux.lux
@@ -1,31 +1,31 @@
 (.module:
   [library
-   [lux (#- int char type primitive)
+   [lux {"-" [int char type primitive]}
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
      ["." try]
-     ["." exception (#+ exception:)]
+     ["." exception {"+" [exception:]}]
      ["<>" parser ("#\." monad)
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" text {"+" [Parser]}]]]
     [data
      ["." product]
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." array]
-      ["." dictionary (#+ Dictionary)]]]
+      ["." dictionary {"+" [Dictionary]}]]]
     [type
      abstract
-     ["." check (#+ Check) ("#\." monad)]]]]
+     ["." check {"+" [Check]} ("#\." monad)]]]]
   ["." //
-   [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter)]
+   [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter]}]
    ["#." descriptor]
    ["#." signature]
    ["#." reflection]
    ["#." parser]
    ["#." box]
-   ["/#" // #_
+   ["/#" // "_"
     [encoding
      ["#." name]]]])
 
diff --git a/stdlib/source/library/lux/target/jvm/type/parser.lux b/stdlib/source/library/lux/target/jvm/type/parser.lux
index cf0064195..3d68ddb85 100644
--- a/stdlib/source/library/lux/target/jvm/type/parser.lux
+++ b/stdlib/source/library/lux/target/jvm/type/parser.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
-   [lux (#- Type int char primitive)
+   [lux {"-" [Type int char primitive]}
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try]
      ["." function]
      ["<>" parser ("#\." monad)
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" text {"+" [Parser]}]]]
     [data
      ["." product]
      [text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list]]]]]
-  ["." // (#+ Type)
-   [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
+  ["." // {"+" [Type]}
+   [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter Declaration]}]
    ["#." signature]
    ["#." descriptor]
-   ["." // #_
+   ["." // "_"
     [encoding
-     ["#." name (#+ External)]]]])
+     ["#." name {"+" [External]}]]]])
 
 (template [<category> <name> <signature> <type>]
   [(def: .public <name>
diff --git a/stdlib/source/library/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/target/jvm/type/reflection.lux
index 936e7347e..576fb0abc 100644
--- a/stdlib/source/library/lux/target/jvm/type/reflection.lux
+++ b/stdlib/source/library/lux/target/jvm/type/reflection.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux (#- int char)
+   [lux {"-" [int char]}
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [type
      abstract]]]
-  ["." // #_
-   [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
+  ["." // "_"
+   [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter Declaration]}]
    ["#." descriptor]
    [//
     [encoding
-     ["#." name (#+ External)]]]])
+     ["#." name {"+" [External]}]]]])
 
 (abstract: .public (Reflection category)
   {}
diff --git a/stdlib/source/library/lux/target/jvm/type/signature.lux b/stdlib/source/library/lux/target/jvm/type/signature.lux
index 957926021..667457d61 100644
--- a/stdlib/source/library/lux/target/jvm/type/signature.lux
+++ b/stdlib/source/library/lux/target/jvm/type/signature.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux (#- int char)
+   [lux {"-" [int char]}
     [abstract
-     [equivalence (#+ Equivalence)]
-     [hash (#+ Hash)]]
+     [equivalence {"+" [Equivalence]}]
+     [hash {"+" [Hash]}]]
     [data
      ["." text ("#\." hash)
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor)]]]
     [type
      abstract]]]
-  ["." // #_
-   [category (#+ Void Value Return Method Primitive Object Class Array Var Parameter Declaration)]
+  ["." // "_"
+   [category {"+" [Void Value Return Method Primitive Object Class Array Var Parameter Declaration]}]
    ["#." descriptor]
-   ["/#" // #_
+   ["/#" // "_"
     [encoding
-     ["#." name (#+ External)]]]])
+     ["#." name {"+" [External]}]]]])
 
 (abstract: .public (Signature category)
   {}
diff --git a/stdlib/source/library/lux/target/jvm/version.lux b/stdlib/source/library/lux/target/jvm/version.lux
index 7fbf55c35..79e839977 100644
--- a/stdlib/source/library/lux/target/jvm/version.lux
+++ b/stdlib/source/library/lux/target/jvm/version.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [control
      ["." try]]]]
-  ["." // #_
+  ["." // "_"
    [encoding
-    ["#." unsigned (#+ U2)]]])
+    ["#." unsigned {"+" [U2]}]]])
 
 (type: .public Version U2)
 (type: .public Minor Version)
diff --git a/stdlib/source/library/lux/target/lua.lux b/stdlib/source/library/lux/target/lua.lux
index faac1b184..540b8e7a0 100644
--- a/stdlib/source/library/lux/target/lua.lux
+++ b/stdlib/source/library/lux/target/lua.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux (#- Location Code Label int if cond function or and not let ^ local)
+   [lux {"-" [Location Code Label int if cond function or and not let ^ local]}
     ["@" target]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [hash (#+ Hash)]
+     [equivalence {"+" [Equivalence]}]
+     [hash {"+" [Hash]}]
      ["." enum]]
     [control
-     [pipe (#+ case> cond> new>)]
+     [pipe {"+" [case> cond> new>]}]
      [parser
       ["<.>" code]]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor mix)]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." template]
      ["." code]]
     [math
diff --git a/stdlib/source/library/lux/target/php.lux b/stdlib/source/library/lux/target/php.lux
index 57fca8e65..5bc937489 100644
--- a/stdlib/source/library/lux/target/php.lux
+++ b/stdlib/source/library/lux/target/php.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux (#- Location Code Global Label static int if cond or and not comment for try global)
+   [lux {"-" [Location Code Global Label static int if cond or and not comment for try global]}
     ["@" target]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [hash (#+ Hash)]
+     [equivalence {"+" [Equivalence]}]
+     [hash {"+" [Hash]}]
      ["." enum]]
     [control
-     [pipe (#+ case> cond> new>)]
+     [pipe {"+" [case> cond> new>]}]
      [parser
       ["<.>" code]]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor mix)]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." template]
      ["." code]]
     [math
diff --git a/stdlib/source/library/lux/target/python.lux b/stdlib/source/library/lux/target/python.lux
index f0d4e23f2..21aa9291f 100644
--- a/stdlib/source/library/lux/target/python.lux
+++ b/stdlib/source/library/lux/target/python.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
-   [lux (#- Location Code Label not or and list if cond int comment exec try)
+   [lux {"-" [Location Code Label not or and list if cond int comment exec try]}
     ["@" target]
     ["." ffi]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [hash (#+ Hash)]
+     [equivalence {"+" [Equivalence]}]
+     [hash {"+" [Hash]}]
      ["." enum]]
     [control
-     [pipe (#+ new> case> cond>)]
+     [pipe {"+" [new> case> cond>]}]
      [parser
       ["<.>" code]]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor mix)]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." template]
      ["." code]]
     [math
diff --git a/stdlib/source/library/lux/target/r.lux b/stdlib/source/library/lux/target/r.lux
index 5b7b9bb47..e6b4bb611 100644
--- a/stdlib/source/library/lux/target/r.lux
+++ b/stdlib/source/library/lux/target/r.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux (#- Code or and list if function cond not int)
+   [lux {"-" [Code or and list if function cond not int]}
     [control
-     [pipe (#+ case> cond> new>)]
+     [pipe {"+" [case> cond> new>]}]
      ["." function]
      ["." maybe ("#\." functor)]
      [parser
       ["<.>" code]]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor mix)]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." template]
      ["." code]]
     [math
diff --git a/stdlib/source/library/lux/target/ruby.lux b/stdlib/source/library/lux/target/ruby.lux
index 501c4d1e7..22ca238d8 100644
--- a/stdlib/source/library/lux/target/ruby.lux
+++ b/stdlib/source/library/lux/target/ruby.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux (#- Location Code static int if cond function or and not comment local global)
+   [lux {"-" [Location Code static int if cond function or and not comment local global]}
     ["@" target]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [hash (#+ Hash)]
+     [equivalence {"+" [Equivalence]}]
+     [hash {"+" [Hash]}]
      ["." enum]]
     [control
-     [pipe (#+ case> cond> new>)]
+     [pipe {"+" [case> cond> new>]}]
      [parser
       ["<.>" code]]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor mix)]]]
     [macro
-     [syntax (#+ syntax:)]
+     [syntax {"+" [syntax:]}]
      ["." template]
      ["." code]]
     [math
diff --git a/stdlib/source/library/lux/target/scheme.lux b/stdlib/source/library/lux/target/scheme.lux
index 5bce310fc..fcf575658 100644
--- a/stdlib/source/library/lux/target/scheme.lux
+++ b/stdlib/source/library/lux/target/scheme.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux (#- Code int or and if cond let)
+   [lux {"-" [Code int or and if cond let]}
     ["@" target]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [hash (#+ Hash)]]
+     [equivalence {"+" [Equivalence]}]
+     [hash {"+" [Hash]}]]
     [control
-     [pipe (#+ new> cond> case>)]]
+     [pipe {"+" [new> cond> case>]}]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor monoid)]]]
     [macro