- Improvements to import syntax [part 0].

239 files changed, 780 insertions, 766 deletions

diff --git a/stdlib/source/lux.lux b/stdlib/source/lux.lux
index 71cdbe716..4710b022b 100644
--- a/stdlib/source/lux.lux
+++ b/stdlib/source/lux.lux
@@ -4112,38 +4112,18 @@
     _
     (return [#Nothing tokens])))
 
-(def: (split-with' p ys xs)
-  (All [a]
-    (-> (-> a Bool) (List a) (List a) [(List a) (List a)]))
-  (case xs
-    #Nil
-    [ys xs]
-
-    (#Cons x xs')
-    (if (p x)
-      (split-with' p (list& x ys) xs')
-      [ys xs])))
-
-(def: (split-with p xs)
-  (All [a]
-    (-> (-> a Bool) (List a) [(List a) (List a)]))
-  (let [[ys' xs'] (split-with' p #Nil xs)]
-    [(list/reverse ys') xs']))
-
 (def: (parse-short-referrals tokens)
   (-> (List Code) (Meta [Referrals (List Code)]))
   (case tokens
-    (^ (list& [_ (#Tag "" "+")] tokens'))
-    (let [[defs tokens'] (split-with symbol? tokens')]
-      (do Monad<Meta>
-        [defs' (extract-defs defs)]
-        (return [(#Only defs') tokens'])))
+    (^ (list& [_ (#Form (list& [_ (#Tag "" "+")] defs))] tokens'))
+    (do Monad<Meta>
+      [defs' (extract-defs defs)]
+      (return [(#Only defs') tokens']))
 
-    (^ (list& [_ (#Tag "" "-")] tokens'))
-    (let [[defs tokens'] (split-with symbol? tokens')]
-      (do Monad<Meta>
-        [defs' (extract-defs defs)]
-        (return [(#Exclude defs') tokens'])))
+    (^ (list& [_ (#Form (list& [_ (#Tag "" "-")] defs))] tokens'))
+    (do Monad<Meta>
+      [defs' (extract-defs defs)]
+      (return [(#Exclude defs') tokens']))
 
     (^ (list& [_ (#Tag "" "*")] tokens'))
     (return [#All tokens'])
diff --git a/stdlib/source/lux/cli.lux b/stdlib/source/lux/cli.lux
index ac04ce673..00b39aed1 100644
--- a/stdlib/source/lux/cli.lux
+++ b/stdlib/source/lux/cli.lux
@@ -7,9 +7,9 @@
              text/format
              ["E" error])
        [io]
-       [macro #+ with-gensyms]
+       [macro (#+ with-gensyms)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])))
+              ["s" syntax (#+ syntax: Syntax)])))
 
 ## [Types]
 (type: #export (CLI a)
diff --git a/stdlib/source/lux/concurrency/actor.lux b/stdlib/source/lux/concurrency/actor.lux
index 187fe54eb..609e649d1 100644
--- a/stdlib/source/lux/concurrency/actor.lux
+++ b/stdlib/source/lux/concurrency/actor.lux
@@ -2,22 +2,22 @@
   lux
   (lux (control monad
                 ["p" parser]
-                ["ex" exception #+ exception:])
-       [io #- run "io/" Monad<IO>]
+                ["ex" exception (#+ exception:)])
+       [io (#- run) "io/" Monad<IO>]
        (data [product]
              ["e" error]
              text/format
              (collection [list "list/" Monoid<List> Monad<List> Fold<List>]))
-       [macro #+ with-gensyms Monad<Meta>]
+       [macro (#+ with-gensyms Monad<Meta>)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax]
+              ["s" syntax (#+ syntax: Syntax)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))
        (type abstract))
-  (// [atom #+ Atom atom]
-      [promise #+ Promise promise "promise/" Monad<Promise>]
-      [task #+ Task]))
+  (// [atom (#+ Atom atom)]
+      [promise (#+ Promise promise) "promise/" Monad<Promise>]
+      [task (#+ Task)]))
 
 (exception: #export poisoned)
 
diff --git a/stdlib/source/lux/concurrency/atom.lux b/stdlib/source/lux/concurrency/atom.lux
index 1c9091dc0..49e16340f 100644
--- a/stdlib/source/lux/concurrency/atom.lux
+++ b/stdlib/source/lux/concurrency/atom.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [function]
-       [io #- run]))
+       [io (#- run)]))
 
 (type: #export (Atom a)
   {#.doc "Atomic references that are safe to mutate concurrently."}
diff --git a/stdlib/source/lux/concurrency/frp.lux b/stdlib/source/lux/concurrency/frp.lux
index 8a1cff374..6b78d875a 100644
--- a/stdlib/source/lux/concurrency/frp.lux
+++ b/stdlib/source/lux/concurrency/frp.lux
@@ -1,13 +1,13 @@
 (.module:
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad])
-       [io #+ IO io]
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)])
+       [io (#+ IO io)]
        (data (collection [list "list/" Monoid<List>]))
        (type abstract))
-  (// [atom #+ Atom atom]
-      [promise #+ Promise]))
+  (// [atom (#+ Atom atom)]
+      [promise (#+ Promise)]))
 
 ## [Types]
 (abstract: #export (Channel a)
diff --git a/stdlib/source/lux/concurrency/promise.lux b/stdlib/source/lux/concurrency/promise.lux
index b2597c2cc..aa0473dc9 100644
--- a/stdlib/source/lux/concurrency/promise.lux
+++ b/stdlib/source/lux/concurrency/promise.lux
@@ -1,12 +1,12 @@
 (.module:
   lux
-  (lux [io #+ IO io]
+  (lux [io (#+ IO io)]
        [function]
-       (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad])
+       (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)])
        (data [product])
-       (concurrency [atom #+ Atom atom])
+       (concurrency [atom (#+ Atom atom)])
        (type abstract)))
 
 (def: #export parallelism
diff --git a/stdlib/source/lux/concurrency/semaphore.lux b/stdlib/source/lux/concurrency/semaphore.lux
index a3ce1174f..b237caa2b 100644
--- a/stdlib/source/lux/concurrency/semaphore.lux
+++ b/stdlib/source/lux/concurrency/semaphore.lux
@@ -1,9 +1,9 @@
 (.module:
   lux
-  (lux (control [monad #+ do])
-       (concurrency [atom #+ Atom]
-                    [promise #+ Promise])
-       [io #+ IO]
+  (lux (control [monad (#+ do)])
+       (concurrency [atom (#+ Atom)]
+                    [promise (#+ Promise)])
+       [io (#+ IO)]
        (type abstract
              [refinement])))
 
diff --git a/stdlib/source/lux/concurrency/stm.lux b/stdlib/source/lux/concurrency/stm.lux
index 26bcf4c36..8039738df 100644
--- a/stdlib/source/lux/concurrency/stm.lux
+++ b/stdlib/source/lux/concurrency/stm.lux
@@ -1,14 +1,14 @@
 (.module:
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad])
-       [io #+ IO io]
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)])
+       [io (#+ IO io)]
        (data [product]
              [maybe]
              (collection [list "list/" Functor<List> Fold<List>]))
-       (concurrency [atom #+ Atom atom]
-                    [promise #+ Promise promise]
+       (concurrency [atom (#+ Atom atom)]
+                    [promise (#+ Promise promise)]
                     [frp "frp/" Functor<Channel>])
        (type abstract)))
 
diff --git a/stdlib/source/lux/concurrency/task.lux b/stdlib/source/lux/concurrency/task.lux
index d51574bbc..3b3b6793c 100644
--- a/stdlib/source/lux/concurrency/task.lux
+++ b/stdlib/source/lux/concurrency/task.lux
@@ -4,10 +4,10 @@
        (control ["F" functor]
                 ["A" apply]
                 monad
-                ["ex" exception #+ Exception])
+                ["ex" exception (#+ Exception)])
        (concurrency ["P" promise])
        [macro]
-       (macro ["s" syntax #+ syntax: Syntax])
+       (macro ["s" syntax (#+ syntax: Syntax)])
        ))
 
 (type: #export (Task a)
diff --git a/stdlib/source/lux/control/apply.lux b/stdlib/source/lux/control/apply.lux
index 2dd932140..95f2de15e 100644
--- a/stdlib/source/lux/control/apply.lux
+++ b/stdlib/source/lux/control/apply.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (// [functor #+ Functor]
-      [monad #+ Monad]))
+  (// [functor (#+ Functor)]
+      [monad (#+ Monad)]))
 
 (signature: #export (Apply f)
   {#.doc "Applicative functors."}
diff --git a/stdlib/source/lux/control/concatenative.lux b/stdlib/source/lux/control/concatenative.lux
index 75c69baf9..05e74accc 100644
--- a/stdlib/source/lux/control/concatenative.lux
+++ b/stdlib/source/lux/control/concatenative.lux
@@ -1,17 +1,17 @@
-(.module: [lux #- if loop when
-           n/+ n/- n/* n// n/% n/= n/< n/<= n/> n/>=
-           i/+ i/- i/* i// i/% i/= i/< i/<= i/> i/>=
-           r/+ r/- r/* r// r/% r/= r/< r/<= r/> r/>=
-           f/+ f/- f/* f// f/% f/= f/< f/<= f/> f/>=]
+(.module: [lux (#- if loop when
+                   n/+ n/- n/* n// n/% n/= n/< n/<= n/> n/>=
+                   i/+ i/- i/* i// i/% i/= i/< i/<= i/> i/>=
+                   r/+ r/- r/* r// r/% r/= r/< r/<= r/> r/>=
+                   f/+ f/- f/* f// f/% f/= f/< f/<= f/> f/>=)]
   (lux (control ["p" parser "p/" Monad<Parser>]
                 [monad])
        (data [text]
              text/format
              [maybe "maybe/" Monad<Maybe>]
              (collection [list "list/" Fold<List> Functor<List>]))
-       [macro #+ with-gensyms Monad<Meta>]
+       [macro (#+ with-gensyms Monad<Meta>)]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))))
diff --git a/stdlib/source/lux/control/continuation.lux b/stdlib/source/lux/control/continuation.lux
index 0cb7b5c7e..fb330967a 100644
--- a/stdlib/source/lux/control/continuation.lux
+++ b/stdlib/source/lux/control/continuation.lux
@@ -1,12 +1,12 @@
 (.module:
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
                 monad)
        function
-       [macro #+ with-gensyms]
+       [macro (#+ with-gensyms)]
        (macro [code]
-              [syntax #+ syntax:])))
+              [syntax (#+ syntax:)])))
 
 (type: #export (Cont i o)
   {#.doc "Continuations."}
diff --git a/stdlib/source/lux/control/contract.lux b/stdlib/source/lux/control/contract.lux
index 72b4c0770..dbe92ad76 100644
--- a/stdlib/source/lux/control/contract.lux
+++ b/stdlib/source/lux/control/contract.lux
@@ -4,7 +4,7 @@
        (data text/format)
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax:])))
+              ["s" syntax (#+ syntax:)])))
 
 (def: #export (assert! message test)
   (-> Text Bool [])
diff --git a/stdlib/source/lux/control/exception.lux b/stdlib/source/lux/control/exception.lux
index bf6859dcd..559324fd2 100644
--- a/stdlib/source/lux/control/exception.lux
+++ b/stdlib/source/lux/control/exception.lux
@@ -1,15 +1,15 @@
 (.module: {#.doc "Exception-handling functionality built on top of the Error type."}
   lux
-  (lux (control [monad #+ do]
+  (lux (control [monad (#+ do)]
                 ["p" parser])
-       (data ["/" error #+ Error]
+       (data ["/" error (#+ Error)]
              [maybe]
              [product]
              [text "text/" Monoid<Text>]
              (collection [list "list/" Functor<List> Fold<List>]))
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax]
+              ["s" syntax (#+ syntax: Syntax)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))))
diff --git a/stdlib/source/lux/control/hash.lux b/stdlib/source/lux/control/hash.lux
index faf7afda8..f1ecfd01d 100644
--- a/stdlib/source/lux/control/hash.lux
+++ b/stdlib/source/lux/control/hash.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (// [equivalence #+ Equivalence]))
+  (// [equivalence (#+ Equivalence)]))
 
 ## [Signatures]
 (signature: #export (Hash a)
diff --git a/stdlib/source/lux/control/interval.lux b/stdlib/source/lux/control/interval.lux
index c000d0cec..ddb505f6f 100644
--- a/stdlib/source/lux/control/interval.lux
+++ b/stdlib/source/lux/control/interval.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
+  (lux (control [equivalence (#+ Equivalence)]
                 [order]
-                [enum #+ Enum])))
+                [enum (#+ Enum)])))
 
 ## Signatures
 (signature: #export (Interval a)
diff --git a/stdlib/source/lux/control/monad.lux b/stdlib/source/lux/control/monad.lux
index 00ef17925..7db3cfd79 100644
--- a/stdlib/source/lux/control/monad.lux
+++ b/stdlib/source/lux/control/monad.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (// [functor #+ Functor]))
+  (// [functor (#+ Functor)]))
 
 ## [Utils]
 (def: (list/fold f init xs)
diff --git a/stdlib/source/lux/control/monad/free.lux b/stdlib/source/lux/control/monad/free.lux
index 400c5fc31..41a2bdfd1 100644
--- a/stdlib/source/lux/control/monad/free.lux
+++ b/stdlib/source/lux/control/monad/free.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
-  (/// [functor #+ Functor]
-       [apply #+ Apply]
-       [monad #+ Monad]))
+  (/// [functor (#+ Functor)]
+       [apply (#+ Apply)]
+       [monad (#+ Monad)]))
 
 (type: #export (Free F a)
   {#.doc "The Free Monad."}
diff --git a/stdlib/source/lux/control/monad/indexed.lux b/stdlib/source/lux/control/monad/indexed.lux
index 4967a016a..cf5039593 100644
--- a/stdlib/source/lux/control/monad/indexed.lux
+++ b/stdlib/source/lux/control/monad/indexed.lux
@@ -4,7 +4,7 @@
                 ["p" parser])
        (data (collection [list "list/" Functor<List> Fold<List>]))
        [macro]
-       (macro ["s" syntax #+ Syntax syntax:])))
+       (macro ["s" syntax (#+ Syntax syntax:)])))
 
 (signature: #export (IxMonad m)
   (: (All [p a]
diff --git a/stdlib/source/lux/control/monoid.lux b/stdlib/source/lux/control/monoid.lux
index 301511971..550b9c25f 100644
--- a/stdlib/source/lux/control/monoid.lux
+++ b/stdlib/source/lux/control/monoid.lux
@@ -1,5 +1,5 @@
 (.module: lux
-  (// [fold #+ Fold]))
+  (// [fold (#+ Fold)]))
 
 (signature: #export (Monoid a)
   {#.doc "A way to compose values.
diff --git a/stdlib/source/lux/control/order.lux b/stdlib/source/lux/control/order.lux
index c06658b21..edd25aca0 100644
--- a/stdlib/source/lux/control/order.lux
+++ b/stdlib/source/lux/control/order.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux function)
-  (// [equivalence #+ Equivalence]))
+  (// [equivalence (#+ Equivalence)]))
 
 ## [Signatures]
 (signature: #export (Order a)
diff --git a/stdlib/source/lux/control/parser.lux b/stdlib/source/lux/control/parser.lux
index 6bdc5877c..0fe19babd 100644
--- a/stdlib/source/lux/control/parser.lux
+++ b/stdlib/source/lux/control/parser.lux
@@ -1,12 +1,12 @@
 (.module:
-  [lux #- not]
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad]
+  [lux (#- not)]
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)]
                 [codec])
        (data (collection [list "list/" Functor<List> Monoid<List>])
              [product]
-             ["e" error #+ Error])))
+             ["e" error (#+ Error)])))
 
 (type: #export (Parser s a)
   {#.doc "A generic parser."}
diff --git a/stdlib/source/lux/control/pipe.lux b/stdlib/source/lux/control/pipe.lux
index aae6a7db5..b5ac74975 100644
--- a/stdlib/source/lux/control/pipe.lux
+++ b/stdlib/source/lux/control/pipe.lux
@@ -1,11 +1,11 @@
 (.module: {#.doc "Composable extensions to the piping macros (|> and <|) that enhance them with various abilities."}
   lux
-  (lux (control [monad #+ do]
+  (lux (control [monad (#+ do)]
                 ["p" parser])
        (data ["e" error]
-             (collection [list #+ "list/" Fold<List> Monad<List>]))
-       [macro #+ with-gensyms]
-       (macro ["s" syntax #+ syntax: Syntax]
+             (collection [list "list/" Fold<List> Monad<List>]))
+       [macro (#+ with-gensyms)]
+       (macro ["s" syntax (#+ syntax: Syntax)]
               [code])
        ))
 
diff --git a/stdlib/source/lux/control/predicate.lux b/stdlib/source/lux/control/predicate.lux
index e9ddf5ff4..b8595afe5 100644
--- a/stdlib/source/lux/control/predicate.lux
+++ b/stdlib/source/lux/control/predicate.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux (control [monoid #+ Monoid])
-       (data (collection [set #+ Set]))
+  (lux (control [monoid (#+ Monoid)])
+       (data (collection [set (#+ Set)]))
        [function]))
 
 (type: #export (Predicate a)
diff --git a/stdlib/source/lux/control/reader.lux b/stdlib/source/lux/control/reader.lux
index 274c5b1cc..0e4e4684b 100644
--- a/stdlib/source/lux/control/reader.lux
+++ b/stdlib/source/lux/control/reader.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control ["F" functor]
                 ["A" apply]
-                [monad #+ do Monad])))
+                [monad (#+ do Monad)])))
 
 ## [Types]
 (type: #export (Reader r a)
diff --git a/stdlib/source/lux/control/region.lux b/stdlib/source/lux/control/region.lux
index 09db5b5a0..51dcfc3d3 100644
--- a/stdlib/source/lux/control/region.lux
+++ b/stdlib/source/lux/control/region.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ Monad do]
-                ["ex" exception #+ Exception exception:])
-       (data ["e" error #+ Error]
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ Monad do)]
+                ["ex" exception (#+ Exception exception:)])
+       (data ["e" error (#+ Error)]
              text/format
              (collection [list "list/" Fold<List>]))))
 
diff --git a/stdlib/source/lux/control/state.lux b/stdlib/source/lux/control/state.lux
index 244052f2d..b96f174aa 100644
--- a/stdlib/source/lux/control/state.lux
+++ b/stdlib/source/lux/control/state.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control ["F" functor]
                 ["A" apply]
-                [monad #+ do Monad])))
+                [monad (#+ do Monad)])))
 
 ## [Types]
 (type: #export (State s a)
diff --git a/stdlib/source/lux/control/thread.lux b/stdlib/source/lux/control/thread.lux
index b54de05ef..d8e995371 100644
--- a/stdlib/source/lux/control/thread.lux
+++ b/stdlib/source/lux/control/thread.lux
@@ -1,9 +1,9 @@
 (.module:
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ Monad do])
-       [io #+ IO]))
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ Monad do)])
+       [io (#+ IO)]))
 
 (type: #export (Thread ! a)
   (-> ! a))
diff --git a/stdlib/source/lux/control/writer.lux b/stdlib/source/lux/control/writer.lux
index 33b0df8a9..07d94ac25 100644
--- a/stdlib/source/lux/control/writer.lux
+++ b/stdlib/source/lux/control/writer.lux
@@ -3,7 +3,7 @@
   (lux/control monoid
                ["F" functor]
                ["A" apply]
-               [monad #+ do Monad]))
+               [monad (#+ do Monad)]))
 
 (type: #export (Writer l a)
   {#.doc "Represents a value with an associated 'log' value to record arbitrary information."}
diff --git a/stdlib/source/lux/data/bit.lux b/stdlib/source/lux/data/bit.lux
index d5c312f14..353a1237a 100644
--- a/stdlib/source/lux/data/bit.lux
+++ b/stdlib/source/lux/data/bit.lux
@@ -1,4 +1,4 @@
-(.module: [lux #- and or not])
+(.module: [lux (#- and or not)])
 
 (def: #export width Nat +64)
 
diff --git a/stdlib/source/lux/data/bool.lux b/stdlib/source/lux/data/bool.lux
index eee9de319..09aa2686b 100644
--- a/stdlib/source/lux/data/bool.lux
+++ b/stdlib/source/lux/data/bool.lux
@@ -1,9 +1,9 @@
 (.module:
   lux
-  (lux (control [monoid #+ Monoid]
-                [equivalence #+ Equivalence]
+  (lux (control [monoid (#+ Monoid)]
+                [equivalence (#+ Equivalence)]
                 hash
-                [codec #+ Codec])
+                [codec (#+ Codec)])
        function))
 
 ## [Structures]
diff --git a/stdlib/source/lux/data/collection/array.lux b/stdlib/source/lux/data/collection/array.lux
index 46d5a9572..eb4c24033 100644
--- a/stdlib/source/lux/data/collection/array.lux
+++ b/stdlib/source/lux/data/collection/array.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
-  (lux (control [monoid #+ Monoid]
-                [functor #+ Functor]
-                [equivalence #+ Equivalence]
+  (lux (control [monoid (#+ Monoid)]
+                [functor (#+ Functor)]
+                [equivalence (#+ Equivalence)]
                 fold)
        (data (collection [list "list/" Fold<List>])
              [product])
diff --git a/stdlib/source/lux/data/collection/bits.lux b/stdlib/source/lux/data/collection/bits.lux
index a7be3a240..c0c644e00 100644
--- a/stdlib/source/lux/data/collection/bits.lux
+++ b/stdlib/source/lux/data/collection/bits.lux
@@ -1,6 +1,6 @@
 (.module:
-  [lux #- not and or]
-  (lux (control [equivalence #+ Equivalence]
+  [lux (#- not and or)]
+  (lux (control [equivalence (#+ Equivalence)]
                 pipe)
        (data [maybe]
              [bit]
diff --git a/stdlib/source/lux/data/collection/dictionary.lux b/stdlib/source/lux/data/collection/dictionary.lux
index 368a77469..69f858502 100644
--- a/stdlib/source/lux/data/collection/dictionary.lux
+++ b/stdlib/source/lux/data/collection/dictionary.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control hash
-                [equivalence #+ Equivalence])
+                [equivalence (#+ Equivalence)])
        (data [maybe]
              (collection [list "list/" Fold<List> Functor<List> Monoid<List>]
                          [array "array/" Functor<Array> Fold<Array>])
diff --git a/stdlib/source/lux/data/collection/dictionary/ordered.lux b/stdlib/source/lux/data/collection/dictionary/ordered.lux
index 478b75a2a..e10526e2c 100644
--- a/stdlib/source/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/lux/data/collection/dictionary/ordered.lux
@@ -1,14 +1,14 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 equivalence
-                [order #+ Order])
+                [order (#+ Order)])
        (data (collection [list "L/" Monad<List> Monoid<List> Fold<List>])
              ["p" product]
              [maybe])
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])))
+              ["s" syntax (#+ syntax: Syntax)])))
 
 (def: error-message Text "Invariant violation")
 
diff --git a/stdlib/source/lux/data/collection/list.lux b/stdlib/source/lux/data/collection/list.lux
index 74ef2e5cc..90380dd50 100644
--- a/stdlib/source/lux/data/collection/list.lux
+++ b/stdlib/source/lux/data/collection/list.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
-  (lux (control [monoid #+ Monoid]
-                [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad]
-                [equivalence #+ Equivalence]
+  (lux (control [monoid (#+ Monoid)]
+                [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)]
                 [fold])
        (data [number "nat/" Codec<Text,Nat>]
              bool
diff --git a/stdlib/source/lux/data/collection/queue.lux b/stdlib/source/lux/data/collection/queue.lux
index a0206a9eb..d05095ead 100644
--- a/stdlib/source/lux/data/collection/queue.lux
+++ b/stdlib/source/lux/data/collection/queue.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
+  (lux (control [equivalence (#+ Equivalence)]
                 ["F" functor])
        (data (collection [list "L/" Monoid<List> Functor<List>]))))
 
diff --git a/stdlib/source/lux/data/collection/queue/priority.lux b/stdlib/source/lux/data/collection/queue/priority.lux
index d697b91c7..75a7e46dc 100644
--- a/stdlib/source/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/lux/data/collection/queue/priority.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
-                [monad #+ do Monad])
-       (data (collection (tree [finger #+ Tree]))
+  (lux (control [equivalence (#+ Equivalence)]
+                [monad (#+ do Monad)])
+       (data (collection (tree [finger (#+ Tree)]))
              [number "nat/" Interval<Nat>]
              [maybe])))
 
diff --git a/stdlib/source/lux/data/collection/row.lux b/stdlib/source/lux/data/collection/row.lux
index ca38f4961..13fb474e5 100644
--- a/stdlib/source/lux/data/collection/row.lux
+++ b/stdlib/source/lux/data/collection/row.lux
@@ -1,9 +1,9 @@
 (.module:
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad]
-                [equivalence #+ Equivalence]
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)]
                 monoid
                 fold
                 ["p" parser])
@@ -12,9 +12,9 @@
                          [array "array/" Functor<Array> Fold<Array>])
              [bit]
              [product])
-       [macro #+ with-gensyms]
+       [macro (#+ with-gensyms)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])
+              ["s" syntax (#+ syntax: Syntax)])
        ))
 
 ## [Utils]
diff --git a/stdlib/source/lux/data/collection/sequence.lux b/stdlib/source/lux/data/collection/sequence.lux
index 1776855c5..439a70672 100644
--- a/stdlib/source/lux/data/collection/sequence.lux
+++ b/stdlib/source/lux/data/collection/sequence.lux
@@ -3,11 +3,11 @@
   (lux (control functor
                 monad
                 comonad
-                [continuation #+ pending Cont]
+                [continuation (#+ pending Cont)]
                 ["p" parser])
-       [macro #+ with-gensyms]
+       [macro (#+ with-gensyms)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])
+              ["s" syntax (#+ syntax: Syntax)])
        (data (collection [list "List/" Monad<List>])
              bool)))
 
diff --git a/stdlib/source/lux/data/collection/set.lux b/stdlib/source/lux/data/collection/set.lux
index 10b7600ca..94a569e6b 100644
--- a/stdlib/source/lux/data/collection/set.lux
+++ b/stdlib/source/lux/data/collection/set.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
-                [hash #+ Hash])
-       (data (collection ["dict" dictionary #+ Dictionary]
+  (lux (control [equivalence (#+ Equivalence)]
+                [hash (#+ Hash)])
+       (data (collection ["dict" dictionary (#+ Dictionary)]
                          [list "list/" Fold<List>]))
        (type abstract)))
 
diff --git a/stdlib/source/lux/data/collection/set/multi.lux b/stdlib/source/lux/data/collection/set/multi.lux
index 613670533..9dbab718d 100644
--- a/stdlib/source/lux/data/collection/set/multi.lux
+++ b/stdlib/source/lux/data/collection/set/multi.lux
@@ -1,14 +1,14 @@
 ## https://en.wikipedia.org/wiki/Multiset
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
-                [hash #+ Hash])
+  (lux (control [equivalence (#+ Equivalence)]
+                [hash (#+ Hash)])
        [function]
-       (language [type #+ :share])
+       (language [type (#+ :share)])
        (type abstract))
   (//// [maybe])
   (/// [list "list/" Fold<List>]
-       [dictionary #+ Dictionary])
+       [dictionary (#+ Dictionary)])
   [//])
 
 (abstract: #export (Set a)
diff --git a/stdlib/source/lux/data/collection/set/ordered.lux b/stdlib/source/lux/data/collection/set/ordered.lux
index f947d0b11..a3344fff6 100644
--- a/stdlib/source/lux/data/collection/set/ordered.lux
+++ b/stdlib/source/lux/data/collection/set/ordered.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
-                [order #+ Order])
+  (lux (control [equivalence (#+ Equivalence)]
+                [order (#+ Order)])
        (data (collection [list "list/" Fold<List>]
                          (dictionary ["//" ordered])))
        (type abstract)))
diff --git a/stdlib/source/lux/data/collection/tree/rose.lux b/stdlib/source/lux/data/collection/tree/rose.lux
index 9eae689d3..f09c50f07 100644
--- a/stdlib/source/lux/data/collection/tree/rose.lux
+++ b/stdlib/source/lux/data/collection/tree/rose.lux
@@ -1,14 +1,14 @@
 (.module:
   lux
   (lux (control functor
-                [monad #+ do Monad]
+                [monad (#+ do Monad)]
                 equivalence
                 ["p" parser]
                 fold)
        (data (collection [list "L/" Monad<List> Fold<List>]))
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])))
+              ["s" syntax (#+ syntax: Syntax)])))
 
 ## [Types]
 (type: #export (Tree a)
diff --git a/stdlib/source/lux/data/collection/tree/rose/parser.lux b/stdlib/source/lux/data/collection/tree/rose/parser.lux
index 3e3535649..3696266dd 100644
--- a/stdlib/source/lux/data/collection/tree/rose/parser.lux
+++ b/stdlib/source/lux/data/collection/tree/rose/parser.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
   (lux (control ["p" parser]
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data ["E" error]))
-  [// #+ Tree]
-  (// [zipper #+ Zipper]))
+  [// (#+ Tree)]
+  (// [zipper (#+ Zipper)]))
 
 (type: #export (Parser t a)
   (p.Parser (Zipper t) a))
diff --git a/stdlib/source/lux/data/collection/tree/rose/zipper.lux b/stdlib/source/lux/data/collection/tree/rose/zipper.lux
index 4a85c68c6..1cacab2aa 100644
--- a/stdlib/source/lux/data/collection/tree/rose/zipper.lux
+++ b/stdlib/source/lux/data/collection/tree/rose/zipper.lux
@@ -3,12 +3,12 @@
   (lux (control functor
                 comonad)
        (data (collection [list "L/" Monad<List> Fold<List> Monoid<List>]
-                         (tree [rose #+ Tree "T/" Functor<Tree>])
-                         [stack #+ Stack])
+                         (tree [rose (#+ Tree) "T/" Functor<Tree>])
+                         [stack (#+ Stack)])
              [maybe "M/" Monad<Maybe>])
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])))
+              ["s" syntax (#+ syntax: Syntax)])))
 
 ## Adapted from the clojure.zip namespace in the Clojure standard library.
 
diff --git a/stdlib/source/lux/data/error.lux b/stdlib/source/lux/data/error.lux
index 6e9f12cb0..456df0b0c 100644
--- a/stdlib/source/lux/data/error.lux
+++ b/stdlib/source/lux/data/error.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control ["F" functor]
                 ["A" apply]
-                ["M" monad #+ do Monad])))
+                ["M" monad (#+ do Monad)])))
 
 ## [Types]
 (type: #export (Error a)
diff --git a/stdlib/source/lux/data/format/binary.lux b/stdlib/source/lux/data/format/binary.lux
index d1d83853d..8cc389e5e 100644
--- a/stdlib/source/lux/data/format/binary.lux
+++ b/stdlib/source/lux/data/format/binary.lux
@@ -1,14 +1,14 @@
 (.module:
-  [lux #- nat int rev list type]
-  (lux (control [monad #+ do Monad]
+  [lux (#- nat int rev list type)]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser]
-                ["ex" exception #+ exception:]
-                [equivalence #+ Equivalence])
+                ["ex" exception (#+ exception:)]
+                [equivalence (#+ Equivalence)])
        (data [error]
              (text [encoding]
-                   [format #+ %n])
+                   [format (#+ %n)])
              [number])
-       (world [blob #+ Blob])))
+       (world [blob (#+ Blob)])))
 
 ## Exceptions
 (exception: #export (blob-was-not-fully-read {length Nat} {read Nat})
diff --git a/stdlib/source/lux/data/format/context.lux b/stdlib/source/lux/data/format/context.lux
index 0a4d8bd92..176fed9f8 100644
--- a/stdlib/source/lux/data/format/context.lux
+++ b/stdlib/source/lux/data/format/context.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
   (lux (control ["p" parser]
-                ["ex" exception #+ exception:]
-                [monad #+ do])
+                ["ex" exception (#+ exception:)]
+                [monad (#+ do)])
        (data ["E" error]
-             (collection ["dict" dictionary #+ Dictionary]))))
+             (collection ["dict" dictionary (#+ Dictionary)]))))
 
 (exception: #export (unknown-property {property Text})
   property)
diff --git a/stdlib/source/lux/data/format/css.lux b/stdlib/source/lux/data/format/css.lux
index 685bd9d6d..56046ad2f 100644
--- a/stdlib/source/lux/data/format/css.lux
+++ b/stdlib/source/lux/data/format/css.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (data [color #+ Color]
+  (lux (data [color (#+ Color)]
              [number]
              [text]
              text/format
diff --git a/stdlib/source/lux/data/format/html.lux b/stdlib/source/lux/data/format/html.lux
index 891800e8a..20e301b3b 100644
--- a/stdlib/source/lux/data/format/html.lux
+++ b/stdlib/source/lux/data/format/html.lux
@@ -1,5 +1,5 @@
 (.module:
-  [lux #- comment]
+  [lux (#- comment)]
   (lux (data [text]
              text/format
              (collection [list "L/" Functor<List>]))))
diff --git a/stdlib/source/lux/data/format/json.lux b/stdlib/source/lux/data/format/json.lux
index 392e16c3b..71cde90f7 100644
--- a/stdlib/source/lux/data/format/json.lux
+++ b/stdlib/source/lux/data/format/json.lux
@@ -1,9 +1,9 @@
 (.module: {#.doc "Functionality for reading and writing values in the JSON format.
 
                   For more information, please see: http://www.json.org/"}
-  [lux #- Array]
-  (lux (control [monad #+ do Monad]
-                [equivalence #+ Equivalence]
+  [lux (#- Array)]
+  (lux (control [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)]
                 codec
                 ["p" parser "parser/" Monad<Parser>])
        (data [bool]
@@ -15,10 +15,10 @@
              [sum]
              [product]
              (collection [list "list/" Fold<List> Monad<List>]
-                         [row #+ Row row "row/" Monad<Row>]
-                         ["dict" dictionary #+ Dictionary]))
-       [macro #+ Monad<Meta> with-gensyms]
-       (macro ["s" syntax #+ syntax:]
+                         [row (#+ Row row) "row/" Monad<Row>]
+                         ["dict" dictionary (#+ Dictionary)]))
+       [macro (#+ Monad<Meta> with-gensyms)]
+       (macro ["s" syntax (#+ syntax:)]
               [code])))
 
 (do-template [<name> <type>]
diff --git a/stdlib/source/lux/data/format/xml.lux b/stdlib/source/lux/data/format/xml.lux
index a966b1bfa..ae3f6e929 100644
--- a/stdlib/source/lux/data/format/xml.lux
+++ b/stdlib/source/lux/data/format/xml.lux
@@ -1,10 +1,10 @@
 (.module: {#.doc "Functionality for reading, generating and processing values in the XML format."}
   lux
   (lux (control monad
-                [equivalence #+ Equivalence]
+                [equivalence (#+ Equivalence)]
                 codec
                 ["p" parser "p/" Monad<Parser>]
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data [text "text/" Equivalence<Text> Monoid<Text>]
              (text ["l" lexer])
              [number]
diff --git a/stdlib/source/lux/data/ident.lux b/stdlib/source/lux/data/ident.lux
index f75b89ab8..e4a7545f0 100644
--- a/stdlib/source/lux/data/ident.lux
+++ b/stdlib/source/lux/data/ident.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
-                [codec #+ Codec]
+  (lux (control [equivalence (#+ Equivalence)]
+                [codec (#+ Codec)]
                 hash)
        (data [text "text/" Monoid<Text> Equivalence<Text>])))
 
diff --git a/stdlib/source/lux/data/lazy.lux b/stdlib/source/lux/data/lazy.lux
index 5a7228935..efe202e21 100644
--- a/stdlib/source/lux/data/lazy.lux
+++ b/stdlib/source/lux/data/lazy.lux
@@ -1,12 +1,12 @@
 (.module:
   lux
   (lux [io]
-       (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ Monad do])
+       (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ Monad do)])
        (concurrency [atom])
-       [macro #+ with-gensyms]
-       (macro ["s" syntax #+ syntax:])
+       [macro (#+ with-gensyms)]
+       (macro ["s" syntax (#+ syntax:)])
        (type abstract)))
 
 (abstract: #export (Lazy a)
diff --git a/stdlib/source/lux/data/maybe.lux b/stdlib/source/lux/data/maybe.lux
index dfc2a557b..c3da0c2a9 100644
--- a/stdlib/source/lux/data/maybe.lux
+++ b/stdlib/source/lux/data/maybe.lux
@@ -3,8 +3,8 @@
   (lux (control ["m" monoid]
                 ["F" functor]
                 ["A" apply]
-                [monad #+ do Monad]
-                [equivalence #+ Equivalence])))
+                [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)])))
 
 ## [Types]
 ## (type: (Maybe a)
diff --git a/stdlib/source/lux/data/number.lux b/stdlib/source/lux/data/number.lux
index 5a32e6ada..d598fbe41 100644
--- a/stdlib/source/lux/data/number.lux
+++ b/stdlib/source/lux/data/number.lux
@@ -1,13 +1,13 @@
 (.module: {#.doc "Implementations of common structures for Lux's primitive number types."}
   lux
   (lux (control number
-                [monoid #+ Monoid]
-                [equivalence #+ Equivalence]
+                [monoid (#+ Monoid)]
+                [equivalence (#+ Equivalence)]
                 hash
                 [order]
                 enum
                 interval
-                [codec #+ Codec])
+                [codec (#+ Codec)])
        (data ["e" error]
              [maybe]
              [bit])))
diff --git a/stdlib/source/lux/data/number/complex.lux b/stdlib/source/lux/data/number/complex.lux
index 3c92e181d..4666626af 100644
--- a/stdlib/source/lux/data/number/complex.lux
+++ b/stdlib/source/lux/data/number/complex.lux
@@ -1,10 +1,10 @@
 (.module: {#.doc "Complex arithmetic."}
   lux
   (lux [math]
-       (control [equivalence #+ Equivalence]
+       (control [equivalence (#+ Equivalence)]
                 number
                 codec
-                ["M" monad #+ do Monad]
+                ["M" monad (#+ do Monad)]
                 ["p" parser])
        (data [number "frac/" Number<Frac> "f/" Codec<Text,Frac>]
              [text "text/" Monoid<Text>]
@@ -12,7 +12,7 @@
              (collection [list "L/" Monad<List>]))
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])))
+              ["s" syntax (#+ syntax: Syntax)])))
 
 (type: #export Complex
   {#real Frac
diff --git a/stdlib/source/lux/data/number/ratio.lux b/stdlib/source/lux/data/number/ratio.lux
index b23128348..a3a123ffb 100644
--- a/stdlib/source/lux/data/number/ratio.lux
+++ b/stdlib/source/lux/data/number/ratio.lux
@@ -1,7 +1,7 @@
 (.module: {#.doc "Rational arithmetic."}
   lux
   (lux [math]
-       (control [equivalence #+ Equivalence]
+       (control [equivalence (#+ Equivalence)]
                 [order]
                 number
                 codec
@@ -15,7 +15,7 @@
              [maybe])
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])))
+              ["s" syntax (#+ syntax: Syntax)])))
 
 (type: #export Ratio
   {#numerator Nat
diff --git a/stdlib/source/lux/data/text.lux b/stdlib/source/lux/data/text.lux
index 1e1a660d7..3ceceb171 100644
--- a/stdlib/source/lux/data/text.lux
+++ b/stdlib/source/lux/data/text.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
-  (lux (control [monoid #+ Monoid]
-                [equivalence #+ Equivalence]
+  (lux (control [monoid (#+ Monoid)]
+                [equivalence (#+ Equivalence)]
                 [order]
-                [monad #+ do Monad]
-                [codec #+ Codec]
+                [monad (#+ do Monad)]
+                [codec (#+ Codec)]
                 hash)
        (data (collection [list])
              [maybe])))
diff --git a/stdlib/source/lux/data/text/buffer.lux b/stdlib/source/lux/data/text/buffer.lux
index 8721b957d..f1b9b770b 100644
--- a/stdlib/source/lux/data/text/buffer.lux
+++ b/stdlib/source/lux/data/text/buffer.lux
@@ -2,10 +2,10 @@
   lux
   (lux (data [product]
              text/format
-             (collection [row #+ Row "row/" Fold<Row>]))
+             (collection [row (#+ Row) "row/" Fold<Row>]))
        (language ["_" host])
        (type abstract)
-       [host #+ import:])
+       [host (#+ import:)])
   [//])
 
 (`` (for {(~~ (static _.jvm))
diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux
index b4e6fe113..7442faa68 100644
--- a/stdlib/source/lux/data/text/encoding.lux
+++ b/stdlib/source/lux/data/text/encoding.lux
@@ -1,9 +1,9 @@
 (.module:
   lux
-  (lux (data [error #+ Error])
-       (world [blob #+ Blob])
+  (lux (data [error (#+ Error)])
+       (world [blob (#+ Blob)])
        (language ["_" host])
-       [host #+ import:]))
+       [host (#+ import:)]))
 
 (`` (for {(~~ (static _.jvm))
           (as-is (def: utf8 Text "UTF-8")
diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux
index 16651957e..ab04746c9 100644
--- a/stdlib/source/lux/data/text/format.lux
+++ b/stdlib/source/lux/data/text/format.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser])
        (data [bool]
              [number]
@@ -15,7 +15,7 @@
        (math [modular])
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])
+              ["s" syntax (#+ syntax: Syntax)])
        (language [type])
        ))
 
diff --git a/stdlib/source/lux/data/text/lexer.lux b/stdlib/source/lux/data/text/lexer.lux
index 9f8bbb664..3821c0081 100644
--- a/stdlib/source/lux/data/text/lexer.lux
+++ b/stdlib/source/lux/data/text/lexer.lux
@@ -1,6 +1,6 @@
 (.module:
-  [lux #- not]
-  (lux (control [monad #+ do Monad]
+  [lux (#- not)]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser])
        (data [text "text/" Monoid<Text>]
              [product]
diff --git a/stdlib/source/lux/data/text/regex.lux b/stdlib/source/lux/data/text/regex.lux
index f0e471ef4..d2cc4e725 100644
--- a/stdlib/source/lux/data/text/regex.lux
+++ b/stdlib/source/lux/data/text/regex.lux
@@ -10,9 +10,9 @@
              ["e" error]
              [maybe]
              (collection [list "list/" Fold<List> Monad<List>]))
-       [macro #+ with-gensyms]
+       [macro (#+ with-gensyms)]
        (macro [code]
-              ["s" syntax #+ syntax:])))
+              ["s" syntax (#+ syntax:)])))
 
 ## [Utils]
 (def: regex-char^
diff --git a/stdlib/source/lux/data/text/unicode.lux b/stdlib/source/lux/data/text/unicode.lux
index 8a88e1184..2bea5dbe2 100644
--- a/stdlib/source/lux/data/text/unicode.lux
+++ b/stdlib/source/lux/data/text/unicode.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
-  (lux (control [interval #+ Interval]
-                [monoid #+ Monoid])
-       (data [number #+ hex "nat/" Interval<Nat>]
+  (lux (control [interval (#+ Interval)]
+                [monoid (#+ Monoid)])
+       (data [number (#+ hex) "nat/" Interval<Nat>]
              (collection [list]
-                         (tree [finger #+ Tree])))
+                         (tree [finger (#+ Tree)])))
        (type abstract)))
 
 (type: #export Char Nat)
diff --git a/stdlib/source/lux/data/trace.lux b/stdlib/source/lux/data/trace.lux
index 9958d94be..f86219be7 100644
--- a/stdlib/source/lux/data/trace.lux
+++ b/stdlib/source/lux/data/trace.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux (control [monoid #+ Monoid]
-                [functor #+ Functor]
+  (lux (control [monoid (#+ Monoid)]
+                [functor (#+ Functor)]
                 comonad)
        function))
 
diff --git a/stdlib/source/lux/function.lux b/stdlib/source/lux/function.lux
index 5c318eb78..a492b3a44 100644
--- a/stdlib/source/lux/function.lux
+++ b/stdlib/source/lux/function.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monoid #+ Monoid])))
+  (lux (control [monoid (#+ Monoid)])))
 
 (def: #export (compose f g)
   {#.doc "Function composition."}
diff --git a/stdlib/source/lux/host.js.lux b/stdlib/source/lux/host.js.lux
index a0d1d0c3f..04b6f6ad2 100644
--- a/stdlib/source/lux/host.js.lux
+++ b/stdlib/source/lux/host.js.lux
@@ -2,10 +2,10 @@
   lux
   (lux (control monad
                 ["p" parser])
-       (data (collection [list #* "L/" Fold<List>]))
-       [macro #+ with-gensyms]
+       (data (collection [list #* "list/" Fold<List>]))
+       [macro (#+ with-gensyms)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])
+              ["s" syntax (#+ syntax: Syntax)])
        ))
 
 (do-template [<name> <type>]
@@ -47,10 +47,10 @@
   {#.doc (doc "A way to create JavaScript objects."
               (object)
               (object "foo" foo "bar" (inc bar)))}
-  (wrap (list (L/fold (function (_ [k v] object)
-                        (` (set! (~ k) (~ v) (~ object))))
-                      (` ("js object"))
-                      kvs))))
+  (wrap (list (list/fold (function (_ [k v] object)
+                           (` (set! (~ k) (~ v) (~ object))))
+                         (` ("js object"))
+                         kvs))))
 
 (syntax: #export (ref {name s.text}
                       {type (p.maybe s.any)})
diff --git a/stdlib/source/lux/host.jvm.lux b/stdlib/source/lux/host.jvm.lux
index 4a680a5a8..9187ee54c 100644
--- a/stdlib/source/lux/host.jvm.lux
+++ b/stdlib/source/lux/host.jvm.lux
@@ -1,9 +1,9 @@
 (.module:
-  [lux #- type]
-  (lux (control [monad #+ do Monad]
+  [lux (#- type)]
+  (lux (control [monad (#+ do Monad)]
                 [enum]
                 ["p" parser])
-       [io #+ IO Monad<IO> io]
+       [io (#+ IO Monad<IO> io)]
        function
        (data (collection [list "list/" Monad<List> Fold<List> Monoid<List>])
              number
@@ -12,9 +12,9 @@
              [text "text/" Equivalence<Text> Monoid<Text>]
              text/format
              [bool "bool/" Codec<Text,Bool>])
-       [macro #+ with-gensyms Functor<Meta> Monad<Meta>]
+       [macro (#+ with-gensyms Functor<Meta> Monad<Meta>)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])
+              ["s" syntax (#+ syntax: Syntax)])
        (language [type "type/" Equivalence<Type>])
        ))
 
diff --git a/stdlib/source/lux/io.lux b/stdlib/source/lux/io.lux
index ca9b80467..7d8ed09ad 100644
--- a/stdlib/source/lux/io.lux
+++ b/stdlib/source/lux/io.lux
@@ -1,10 +1,10 @@
 (.module: {#.doc "A method for abstracting I/O and effectful computations to make it safe while writing pure functional code."}
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad]
-                ["ex" exception #+ Exception])
-       (data ["e" error #+ Error]
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)]
+                ["ex" exception (#+ Exception)])
+       (data ["e" error (#+ Error)]
              (collection [list]))))
 
 (type: #export (IO a)
diff --git a/stdlib/source/lux/language/compiler.lux b/stdlib/source/lux/language/compiler.lux
index 2e88938de..db2010e7f 100644
--- a/stdlib/source/lux/language/compiler.lux
+++ b/stdlib/source/lux/language/compiler.lux
@@ -1,14 +1,14 @@
 (.module:
   lux
   (lux (control [state]
-                ["ex" exception #+ Exception exception:]
-                [monad #+ do])
+                ["ex" exception (#+ Exception exception:)]
+                [monad (#+ do)])
        (data [product]
-             [error #+ Error]
+             [error (#+ Error)]
              [text]
              text/format)
        [function]
-       (macro ["s" syntax #+ syntax:])))
+       (macro ["s" syntax (#+ syntax:)])))
 
 (type: #export (Operation s o)
   (state.State' Error s o))
diff --git a/stdlib/source/lux/language/compiler/analysis.lux b/stdlib/source/lux/language/compiler/analysis.lux
index 87a4cbe4f..82dc69f0d 100644
--- a/stdlib/source/lux/language/compiler/analysis.lux
+++ b/stdlib/source/lux/language/compiler/analysis.lux
@@ -1,11 +1,11 @@
 (.module:
-  [lux #- nat int rev]
+  [lux (#- nat int rev)]
   (lux (data [product]
              [error]
              [text "text/" Equivalence<Text>]
              (collection [list "list/" Fold<List>]))
        [function])
-  [///reference #+ Register Variable Reference]
+  [///reference (#+ Register Variable Reference)]
   [//])
 
 (type: #export #rec Primitive
diff --git a/stdlib/source/lux/language/compiler/analysis/case.lux b/stdlib/source/lux/language/compiler/analysis/case.lux
index fc1e83d4a..ebf2ba864 100644
--- a/stdlib/source/lux/language/compiler/analysis/case.lux
+++ b/stdlib/source/lux/language/compiler/analysis/case.lux
@@ -1,7 +1,7 @@
 (.module:
-  [lux #- case]
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  [lux (#- case)]
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data [product]
              [error]
              [maybe]
@@ -13,7 +13,7 @@
         (type ["tc" check])
         [scope])
   [///]
-  [// #+ Pattern Analysis Operation Compiler]
+  [// (#+ Pattern Analysis Operation Compiler)]
   [//type]
   [//structure]
   [/coverage])
diff --git a/stdlib/source/lux/language/compiler/analysis/case/coverage.lux b/stdlib/source/lux/language/compiler/analysis/case/coverage.lux
index 70c9fa80f..4a15e372c 100644
--- a/stdlib/source/lux/language/compiler/analysis/case/coverage.lux
+++ b/stdlib/source/lux/language/compiler/analysis/case/coverage.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:]
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)]
                 equivalence)
        (data [bool "bool/" Equivalence<Bool>]
              [number]
@@ -9,9 +9,9 @@
              [maybe]
              text/format
              (collection [list "list/" Fold<List>]
-                         ["dict" dictionary #+ Dictionary])))
+                         ["dict" dictionary (#+ Dictionary)])))
   [//// "operation/" Monad<Operation>]
-  [/// #+ Pattern Variant Operation])
+  [/// (#+ Pattern Variant Operation)])
 
 (def: cases
   (-> (Maybe Nat) Nat)
diff --git a/stdlib/source/lux/language/compiler/analysis/expression.lux b/stdlib/source/lux/language/compiler/analysis/expression.lux
index 2ef2cae5b..f9a44f2f2 100644
--- a/stdlib/source/lux/language/compiler/analysis/expression.lux
+++ b/stdlib/source/lux/language/compiler/analysis/expression.lux
@@ -1,16 +1,16 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data ["e" error]
              [product]
              text/format)
        [macro])
-  [//// #+ Eval]
+  [//// (#+ Eval)]
   ## (//// [".L" macro]
   ##       [".L" extension])
   [///]
-  [// #+ Analysis Operation Compiler]
+  [// (#+ Analysis Operation Compiler)]
   [//type]
   [//primitive]
   [//structure]
diff --git a/stdlib/source/lux/language/compiler/analysis/function.lux b/stdlib/source/lux/language/compiler/analysis/function.lux
index fc925b68b..da9c223a4 100644
--- a/stdlib/source/lux/language/compiler/analysis/function.lux
+++ b/stdlib/source/lux/language/compiler/analysis/function.lux
@@ -1,7 +1,7 @@
 (.module:
-  [lux #- function]
+  [lux (#- function)]
   (lux (control monad
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data [maybe]
              [text]
              text/format
@@ -12,7 +12,7 @@
                  (type ["tc" check])
                  [".L" scope]))
   [///]
-  [// #+ Analysis Compiler]
+  [// (#+ Analysis Compiler)]
   [//type]
   [//inference])
 
diff --git a/stdlib/source/lux/language/compiler/analysis/inference.lux b/stdlib/source/lux/language/compiler/analysis/inference.lux
index a89ed40f8..12f5f0e6d 100644
--- a/stdlib/source/lux/language/compiler/analysis/inference.lux
+++ b/stdlib/source/lux/language/compiler/analysis/inference.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data [maybe]
              [text]
              text/format
@@ -9,8 +9,8 @@
        [macro])
   (//// [type]
         (type ["tc" check]))
-  [/// #+ "operation/" Monad<Operation>]
-  [// #+ Tag Analysis Operation Compiler]
+  [/// "operation/" Monad<Operation>]
+  [// (#+ Tag Analysis Operation Compiler)]
   [//type])
 
 (exception: #export (variant-tag-out-of-bounds {size Nat} {tag Tag} {type Type})
diff --git a/stdlib/source/lux/language/compiler/analysis/primitive.lux b/stdlib/source/lux/language/compiler/analysis/primitive.lux
index 5f6604926..5fa4c1ba1 100644
--- a/stdlib/source/lux/language/compiler/analysis/primitive.lux
+++ b/stdlib/source/lux/language/compiler/analysis/primitive.lux
@@ -1,8 +1,8 @@
 (.module:
-  [lux #- nat int rev]
+  [lux (#- nat int rev)]
   (lux (control monad)
        [macro])
-  [// #+ Analysis]
+  [// (#+ Analysis)]
   (// [".A" type]))
 
 ## [Analysers]
diff --git a/stdlib/source/lux/language/compiler/analysis/reference.lux b/stdlib/source/lux/language/compiler/analysis/reference.lux
index bfc4e9faa..814f0c47e 100644
--- a/stdlib/source/lux/language/compiler/analysis/reference.lux
+++ b/stdlib/source/lux/language/compiler/analysis/reference.lux
@@ -1,14 +1,14 @@
 (.module:
   lux
   (lux (control monad
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        [macro]
        (macro [code])
        (language (type ["tc" check]))
        (data [text "text/" Equivalence<Text>]
              text/format))
   [///]
-  [// #+ Analysis Operation]
+  [// (#+ Analysis Operation)]
   [//type]
   [////reference]
   [////scope])
diff --git a/stdlib/source/lux/language/compiler/analysis/structure.lux b/stdlib/source/lux/language/compiler/analysis/structure.lux
index 087ffa8c5..49c412e05 100644
--- a/stdlib/source/lux/language/compiler/analysis/structure.lux
+++ b/stdlib/source/lux/language/compiler/analysis/structure.lux
@@ -1,20 +1,20 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data [ident]
              [number]
              [product]
              [maybe]
              (collection [list "list/" Functor<List>]
-                         ["dict" dictionary #+ Dictionary])
+                         ["dict" dictionary (#+ Dictionary)])
              text/format)
        [macro]
        (macro [code]))
   (//// [type]
         (type ["tc" check]))
   [///]
-  [// #+ Tag Analysis Operation Compiler]
+  [// (#+ Tag Analysis Operation Compiler)]
   [//type]
   [//primitive]
   [//inference])
diff --git a/stdlib/source/lux/language/compiler/analysis/type.lux b/stdlib/source/lux/language/compiler/analysis/type.lux
index bc2ccccfe..821da5557 100644
--- a/stdlib/source/lux/language/compiler/analysis/type.lux
+++ b/stdlib/source/lux/language/compiler/analysis/type.lux
@@ -1,11 +1,11 @@
 (.module:
   lux
-  (lux (control [monad #+ do])
+  (lux (control [monad (#+ do)])
        (data [error])
        [macro]
        (language (type ["tc" check])))
   [///]
-  [// #+ Operation])
+  [// (#+ Operation)])
 
 (def: #export (with-type expected action)
   (All [a] (-> Type (Operation a) (Operation a)))
diff --git a/stdlib/source/lux/language/compiler/default/cache.lux b/stdlib/source/lux/language/compiler/default/cache.lux
index a878e1615..42b13ba86 100644
--- a/stdlib/source/lux/language/compiler/default/cache.lux
+++ b/stdlib/source/lux/language/compiler/default/cache.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (data (format [binary #+ Binary]))))
+  (lux (data (format [binary (#+ Binary)]))))
 
 (def: definition
   (Binary Definition)
diff --git a/stdlib/source/lux/language/compiler/default/repl/type.lux b/stdlib/source/lux/language/compiler/default/repl/type.lux
index bb210bf7f..30131d159 100644
--- a/stdlib/source/lux/language/compiler/default/repl/type.lux
+++ b/stdlib/source/lux/language/compiler/default/repl/type.lux
@@ -1,21 +1,21 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:]
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)]
                 ["p" parser]
                 pipe)
-       (data [error #+ Error]
+       (data [error (#+ Error)]
              text/format
-             (format [xml #+ XML]
-                     [json #+ JSON])
+             (format [xml (#+ XML)]
+                     [json (#+ JSON)])
              (collection [list]))
-       (time [instant #+ Instant]
-             [duration #+ Duration]
-             [date #+ Date])
+       (time [instant (#+ Instant)]
+             [duration (#+ Duration)]
+             [date (#+ Date)])
        [function]
        [macro]
        (macro [code]
-              [poly #+ Poly])
+              [poly (#+ Poly)])
        (language [type])))
 
 (exception: #export (cannot-represent-value {type Type})
diff --git a/stdlib/source/lux/language/compiler/extension.lux b/stdlib/source/lux/language/compiler/extension.lux
index e23e9b511..91b48dfb7 100644
--- a/stdlib/source/lux/language/compiler/extension.lux
+++ b/stdlib/source/lux/language/compiler/extension.lux
@@ -1,11 +1,11 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
-       (data [error #+ Error]
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
+       (data [error (#+ Error)]
              [text]
-             (collection ["dict" dictionary #+ Dictionary])))
-  [// #+ Operation Compiler])
+             (collection ["dict" dictionary (#+ Dictionary)])))
+  [// (#+ Operation Compiler)])
 
 (type: #export (Extension i)
   (#Base i)
diff --git a/stdlib/source/lux/language/compiler/extension/analysis.lux b/stdlib/source/lux/language/compiler/extension/analysis.lux
index 9f48c79b4..205a65312 100644
--- a/stdlib/source/lux/language/compiler/extension/analysis.lux
+++ b/stdlib/source/lux/language/compiler/extension/analysis.lux
@@ -2,9 +2,9 @@
   lux
   (lux (data [text]
              (collection [list "list/" Functor<List>]
-                         ["dict" dictionary #+ Dictionary])))
-  [///analysis #+ Analysis State]
-  [///synthesis #+ Synthesis]
+                         ["dict" dictionary (#+ Dictionary)])))
+  [///analysis (#+ Analysis State)]
+  [///synthesis (#+ Synthesis)]
   [//]
   [/common]
   [/host])
diff --git a/stdlib/source/lux/language/compiler/extension/analysis/common.lux b/stdlib/source/lux/language/compiler/extension/analysis/common.lux
index a0525cf12..dc0bdf740 100644
--- a/stdlib/source/lux/language/compiler/extension/analysis/common.lux
+++ b/stdlib/source/lux/language/compiler/extension/analysis/common.lux
@@ -1,19 +1,19 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:]
-                [thread #+ Box])
-       (concurrency [atom #+ Atom])
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)]
+                [thread (#+ Box)])
+       (concurrency [atom (#+ Atom)])
        (data [text]
              text/format
              (collection [list "list/" Functor<List>]
                          [array]
-                         ["dict" dictionary #+ Dictionary]))
+                         ["dict" dictionary (#+ Dictionary)]))
        [language]
        (language (type ["tc" check]))
-       [io #+ IO])
+       [io (#+ IO)])
   [////]
-  (//// [analysis #+ Analysis]
+  (//// [analysis (#+ Analysis)]
         (analysis [".A" type]
                   [".A" case]
                   [".A" function]))
diff --git a/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux b/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux
index c11a6d5f4..7b5e358cb 100644
--- a/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux
+++ b/stdlib/source/lux/language/compiler/extension/analysis/host.jvm.lux
@@ -1,8 +1,8 @@
 (.module:
-  [lux #- char int]
-  (lux (control [monad #+ do]
+  [lux (#- char int)]
+  (lux (control [monad (#+ do)]
                 ["p" parser]
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data ["e" error]
              [maybe]
              [product]
@@ -12,7 +12,7 @@
                    ["l" lexer])
              (collection [list "list/" Fold<List> Functor<List> Monoid<List>]
                          [array]
-                         ["dict" dictionary #+ Dictionary]))
+                         ["dict" dictionary (#+ Dictionary)]))
        [macro "macro/" Monad<Meta>]
        (macro [code]
               ["s" syntax])
@@ -21,7 +21,7 @@
                  (type ["tc" check]))
        [host])
   ["/" //common]
-  (//// [".L" analysis #+ Analysis]
+  (//// [".L" analysis (#+ Analysis)]
         (analysis [".A" type]
                   [".A" inference]))
   [///]
diff --git a/stdlib/source/lux/language/compiler/extension/bundle.lux b/stdlib/source/lux/language/compiler/extension/bundle.lux
index 4e011d2ca..677f32792 100644
--- a/stdlib/source/lux/language/compiler/extension/bundle.lux
+++ b/stdlib/source/lux/language/compiler/extension/bundle.lux
@@ -1,11 +1,11 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data [text]
              text/format
              (collection [list "list/" Functor<List>]
-                         ["dict" dictionary #+ Dictionary])))
+                         ["dict" dictionary (#+ Dictionary)])))
   [//])
 
 (exception: #export (incorrect-arity {name Text} {arity Nat} {args Nat})
diff --git a/stdlib/source/lux/language/compiler/extension/synthesis.lux b/stdlib/source/lux/language/compiler/extension/synthesis.lux
index 48073d012..db1671c93 100644
--- a/stdlib/source/lux/language/compiler/extension/synthesis.lux
+++ b/stdlib/source/lux/language/compiler/extension/synthesis.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (data [text]
-             (collection ["dict" dictionary #+ Dictionary])))
+             (collection ["dict" dictionary (#+ Dictionary)])))
   [//])
 
 (def: #export defaults
diff --git a/stdlib/source/lux/language/compiler/extension/translation.lux b/stdlib/source/lux/language/compiler/extension/translation.lux
index ae05fd61c..345333a8a 100644
--- a/stdlib/source/lux/language/compiler/extension/translation.lux
+++ b/stdlib/source/lux/language/compiler/extension/translation.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (data [text]
-             (collection ["dict" dictionary #+ Dictionary])))
+             (collection ["dict" dictionary (#+ Dictionary)])))
   [//])
 
 (def: #export defaults
diff --git a/stdlib/source/lux/language/compiler/meta/archive.lux b/stdlib/source/lux/language/compiler/meta/archive.lux
index b8c38928c..4acb0b895 100644
--- a/stdlib/source/lux/language/compiler/meta/archive.lux
+++ b/stdlib/source/lux/language/compiler/meta/archive.lux
@@ -1,17 +1,17 @@
 (.module:
   lux
-  (lux (control ["ex" exception #+ exception:]
-                [equivalence #+ Equivalence]
-                [monad #+ do])
-       (data [error #+ Error]
+  (lux (control ["ex" exception (#+ exception:)]
+                [equivalence (#+ Equivalence)]
+                [monad (#+ do)])
+       (data [error (#+ Error)]
              [ident]
              [text]
              text/format
-             (collection ["dict" dictionary #+ Dictionary]))
-       (language [type #+ :share])
+             (collection ["dict" dictionary (#+ Dictionary)]))
+       (language [type (#+ :share)])
        (type abstract)
-       (world [file #+ File]))
-  [//// #+ Version])
+       (world [file (#+ File)]))
+  [//// (#+ Version)])
 
 ## Key
 (type: #export Signature
diff --git a/stdlib/source/lux/language/compiler/meta/cache.lux b/stdlib/source/lux/language/compiler/meta/cache.lux
index 7c6b558db..295f7bc38 100644
--- a/stdlib/source/lux/language/compiler/meta/cache.lux
+++ b/stdlib/source/lux/language/compiler/meta/cache.lux
@@ -1,24 +1,24 @@
 (.module:
-  [lux #- Module]
-  (lux (control [monad #+ Monad do]
-                ["ex" exception #+ exception:]
+  [lux (#- Module)]
+  (lux (control [monad (#+ Monad do)]
+                ["ex" exception (#+ exception:)]
                 pipe)
        (data [bool "bool/" Equivalence<Bool>]
              [maybe]
              [error]
              [product]
-             (format [binary #+ Binary])
+             (format [binary (#+ Binary)])
              [text]
              text/format
              (collection [list "list/" Functor<List> Fold<List>]
-                         ["dict" dictionary #+ Dictionary]
-                         [set #+ Set]))
-       (world [file #+ File System]))
-  [//io #+ Context Module]
+                         ["dict" dictionary (#+ Dictionary)]
+                         [set (#+ Set)]))
+       (world [file (#+ File System)]))
+  [//io (#+ Context Module)]
   [//io/context]
   [//io/archive]
-  [//archive #+ Signature Key Descriptor Document Archive]
-  [/dependency #+ Dependency Graph])
+  [//archive (#+ Signature Key Descriptor Document Archive)]
+  [/dependency (#+ Dependency Graph)])
 
 (exception: #export (cannot-delete-cached-file {file File})
   (ex.report ["File" file]))
diff --git a/stdlib/source/lux/language/compiler/meta/cache/dependency.lux b/stdlib/source/lux/language/compiler/meta/cache/dependency.lux
index f489f04ed..22c989519 100644
--- a/stdlib/source/lux/language/compiler/meta/cache/dependency.lux
+++ b/stdlib/source/lux/language/compiler/meta/cache/dependency.lux
@@ -1,10 +1,10 @@
 (.module:
-  [lux #- Module]
+  [lux (#- Module)]
   (lux (data [text]
              (collection [list "list/" Functor<List> Fold<List>]
-                         ["dict" dictionary #+ Dictionary])))
-  [///io #+ Module]
-  [///archive #+ Archive])
+                         ["dict" dictionary (#+ Dictionary)])))
+  [///io (#+ Module)]
+  [///archive (#+ Archive)])
 
 (type: #export Graph (Dictionary Module (List Module)))
 
diff --git a/stdlib/source/lux/language/compiler/meta/io.lux b/stdlib/source/lux/language/compiler/meta/io.lux
index e440c16f9..e3d218b4c 100644
--- a/stdlib/source/lux/language/compiler/meta/io.lux
+++ b/stdlib/source/lux/language/compiler/meta/io.lux
@@ -1,13 +1,13 @@
 (.module:
-  [lux #- Module]
+  [lux (#- Module)]
   (lux (control monad
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data [error]
              [text]
              (text format
                    [encoding]))
-       (world [file #+ File System]
-              [blob #+ Blob])))
+       (world [file (#+ File System)]
+              [blob (#+ Blob)])))
 
 (type: #export Context File)
 
diff --git a/stdlib/source/lux/language/compiler/meta/io/archive.lux b/stdlib/source/lux/language/compiler/meta/io/archive.lux
index 534c9e20c..55216039f 100644
--- a/stdlib/source/lux/language/compiler/meta/io/archive.lux
+++ b/stdlib/source/lux/language/compiler/meta/io/archive.lux
@@ -1,14 +1,14 @@
 (.module:
-  [lux #- Module]
+  [lux (#- Module)]
   (lux (control monad
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data [error]
              [text]
              text/format)
-       (world [file #+ File System]
-              [blob #+ Blob]))
+       (world [file (#+ File System)]
+              [blob (#+ Blob)]))
   [/////host]
-  [// #+ Module])
+  [// (#+ Module)])
 
 (type: #export Document File)
 
diff --git a/stdlib/source/lux/language/compiler/meta/io/context.lux b/stdlib/source/lux/language/compiler/meta/io/context.lux
index 327f52cf5..928784951 100644
--- a/stdlib/source/lux/language/compiler/meta/io/context.lux
+++ b/stdlib/source/lux/language/compiler/meta/io/context.lux
@@ -1,14 +1,14 @@
 (.module:
-  [lux #- Module Code]
+  [lux (#- Module Code)]
   (lux (control monad
-                ["ex" exception #+ Exception exception:])
+                ["ex" exception (#+ Exception exception:)])
        (data [error]
              (text format
                    [encoding]))
-       (world [file #+ File System]
-              [blob #+ Blob]))
+       (world [file (#+ File System)]
+              [blob (#+ Blob)]))
   [/////host]
-  [// #+ Context Module])
+  [// (#+ Context Module)])
 
 (type: #export Extension Text)
 
diff --git a/stdlib/source/lux/language/compiler/synthesis.lux b/stdlib/source/lux/language/compiler/synthesis.lux
index 36db1fe5e..3a16d60a1 100644
--- a/stdlib/source/lux/language/compiler/synthesis.lux
+++ b/stdlib/source/lux/language/compiler/synthesis.lux
@@ -1,11 +1,11 @@
 (.module:
-  [lux #- i64 Scope]
-  (lux (control [monad #+ do])
-       (data [error #+ Error]
-             (collection ["dict" dictionary #+ Dictionary])))
-  [///reference #+ Register Variable Reference]
-  [// #+ Operation Compiler]
-  [//analysis #+ Environment Arity Analysis])
+  [lux (#- i64 Scope)]
+  (lux (control [monad (#+ do)])
+       (data [error (#+ Error)]
+             (collection ["dict" dictionary (#+ Dictionary)])))
+  [///reference (#+ Register Variable Reference)]
+  [// (#+ Operation Compiler)]
+  [//analysis (#+ Environment Arity Analysis)])
 
 (type: #export Resolver (Dictionary Variable Variable))
 
diff --git a/stdlib/source/lux/language/compiler/synthesis/case.lux b/stdlib/source/lux/language/compiler/synthesis/case.lux
index 5fca60a99..092424ec8 100644
--- a/stdlib/source/lux/language/compiler/synthesis/case.lux
+++ b/stdlib/source/lux/language/compiler/synthesis/case.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
+  (lux (control [equivalence (#+ Equivalence)]
                 pipe
-                [monad #+ do])
+                [monad (#+ do)])
        (data [product]
              [bool "bool/" Equivalence<Bool>]
              [text "text/" Equivalence<Text>]
@@ -10,9 +10,9 @@
              [number "frac/" Equivalence<Frac>]
              (collection [list "list/" Fold<List> Monoid<List>])))
   [///reference]
-  [///compiler #+ Operation "operation/" Monad<Operation>]
-  [///analysis #+ Pattern Match Analysis]
-  [// #+ Path Synthesis]
+  [///compiler (#+ Operation) "operation/" Monad<Operation>]
+  [///analysis (#+ Pattern Match Analysis)]
+  [// (#+ Path Synthesis)]
   [//function])
 
 (def: (path' pattern bodyC)
diff --git a/stdlib/source/lux/language/compiler/synthesis/expression.lux b/stdlib/source/lux/language/compiler/synthesis/expression.lux
index 6db9a8fd5..a1171baef 100644
--- a/stdlib/source/lux/language/compiler/synthesis/expression.lux
+++ b/stdlib/source/lux/language/compiler/synthesis/expression.lux
@@ -1,15 +1,15 @@
 (.module:
-  [lux #- primitive]
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  [lux (#- primitive)]
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data [maybe]
              (collection [list "list/" Functor<List>]
-                         ["dict" dictionary #+ Dictionary])))
+                         ["dict" dictionary (#+ Dictionary)])))
   [///reference]
   [///compiler "operation/" Monad<Operation>]
-  [///analysis #+ Analysis]
-  [///extension #+ Extension]
-  [// #+ Synthesis]
+  [///analysis (#+ Analysis)]
+  [///extension (#+ Extension)]
+  [// (#+ Synthesis)]
   [//function]
   [//case])
 
diff --git a/stdlib/source/lux/language/compiler/synthesis/function.lux b/stdlib/source/lux/language/compiler/synthesis/function.lux
index ae7b5c3b3..6e2ee638c 100644
--- a/stdlib/source/lux/language/compiler/synthesis/function.lux
+++ b/stdlib/source/lux/language/compiler/synthesis/function.lux
@@ -1,17 +1,17 @@
 (.module:
-  [lux #- function]
-  (lux (control [monad #+ do]
+  [lux (#- function)]
+  (lux (control [monad (#+ do)]
                 [state]
                 pipe
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data [maybe "maybe/" Monad<Maybe>]
              [error]
              (collection [list "list/" Functor<List> Monoid<List> Fold<List>]
-                         ["dict" dictionary #+ Dictionary])))
-  [///reference #+ Variable]
-  [///compiler #+ Operation]
-  [///analysis #+ Environment Arity Analysis]
-  [// #+ Synthesis Synthesizer]
+                         ["dict" dictionary (#+ Dictionary)])))
+  [///reference (#+ Variable)]
+  [///compiler (#+ Operation)]
+  [///analysis (#+ Environment Arity Analysis)]
+  [// (#+ Synthesis Synthesizer)]
   [//loop])
 
 (def: #export nested?
diff --git a/stdlib/source/lux/language/compiler/synthesis/loop.lux b/stdlib/source/lux/language/compiler/synthesis/loop.lux
index e4722ee1f..898bb916b 100644
--- a/stdlib/source/lux/language/compiler/synthesis/loop.lux
+++ b/stdlib/source/lux/language/compiler/synthesis/loop.lux
@@ -1,15 +1,15 @@
 (.module:
-  [lux #- loop]
-  (lux (control [monad #+ do]
+  [lux (#- loop)]
+  (lux (control [monad (#+ do)]
                 ["p" parser])
        (data [maybe "maybe/" Monad<Maybe>]
              (collection [list "list/" Functor<List>]))
        (macro [code]
               [syntax]))
   [///]
-  [///reference #+ Register Variable]
-  [///analysis #+ Environment]
-  [// #+ Path Abstraction Synthesis])
+  [///reference (#+ Register Variable)]
+  [///analysis (#+ Environment)]
+  [// (#+ Path Abstraction Synthesis)])
 
 (type: #export (Transform a)
   (-> a (Maybe a)))
diff --git a/stdlib/source/lux/language/compiler/translation.lux b/stdlib/source/lux/language/compiler/translation.lux
index 8791c8d5e..d2114d9a2 100644
--- a/stdlib/source/lux/language/compiler/translation.lux
+++ b/stdlib/source/lux/language/compiler/translation.lux
@@ -1,16 +1,16 @@
 (.module:
   lux
-  (lux (control ["ex" exception #+ exception:]
-                [monad #+ do])
+  (lux (control ["ex" exception (#+ exception:)]
+                [monad (#+ do)])
        (data [maybe "maybe/" Functor<Maybe>]
-             [error #+ Error]
+             [error (#+ Error)]
              [text]
              text/format
-             (collection [row #+ Row]
-                         ["dict" dictionary #+ Dictionary]))
-       (world [file #+ File]))
-  [// #+ Operation Compiler]
-  [//synthesis #+ Synthesis])
+             (collection [row (#+ Row)]
+                         ["dict" dictionary (#+ Dictionary)]))
+       (world [file (#+ File)]))
+  [// (#+ Operation Compiler)]
+  [//synthesis (#+ Synthesis)])
 
 (do-template [<name>]
   [(exception: #export (<name>)
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux
index 39b5bdae1..e20296d82 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/case.jvm.lux
@@ -1,17 +1,17 @@
 (.module:
-  [lux #- case let if]
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  [lux (#- case let if)]
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data [number]
              [text]
              text/format
              (collection [list "list/" Functor<List> Fold<List>]
-                         [set #+ Set])))
-  (///// [reference #+ Register]
-         (host ["_" scheme #+ Expression Computation Var])
-         [compiler #+ "operation/" Monad<Operation>]
-         (compiler [synthesis #+ Synthesis Path]))
-  [//runtime #+ Operation Translator]
+                         [set (#+ Set)])))
+  (///// [reference (#+ Register)]
+         (host ["_" scheme (#+ Expression Computation Var)])
+         [compiler "operation/" Monad<Operation>]
+         (compiler [synthesis (#+ Synthesis Path)]))
+  [//runtime (#+ Operation Translator)]
   [//reference])
 
 (def: #export (let translate [valueS register bodyS])
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux
index a654fe4d0..60fd99ea8 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/expression.jvm.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
-  (lux (control [monad #+ do]))
+  (lux (control [monad (#+ do)]))
   (///// [compiler]
          (compiler [synthesis]
                    [extension]))
-  [//runtime #+ Translator]
+  [//runtime (#+ Translator)]
   [//primitive]
   [//structure]
   [//reference]
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux
index 9fa0abc55..f746bc142 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/extension.jvm.lux
@@ -1,15 +1,15 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data [maybe]
              text/format
-             (collection ["dict" dictionary #+ Dictionary])))
-  (///// [reference #+ Register Variable]
-         (host ["_" scheme #+ Computation])
+             (collection ["dict" dictionary (#+ Dictionary)])))
+  (///// [reference (#+ Register Variable)]
+         (host ["_" scheme (#+ Computation)])
          [compiler "operation/" Monad<Operation>]
-         (compiler [synthesis #+ Synthesis]))
-  [//runtime #+ Operation Translator]
+         (compiler [synthesis (#+ Synthesis)]))
+  [//runtime (#+ Operation Translator)]
   [/common]
   ## [/host]
   )
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux
index 11743b076..c8b66a745 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/extension/common.jvm.lux
@@ -1,22 +1,22 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:])
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (data ["e" error]
              [product]
              [text]
              text/format
-             [number #+ hex]
+             [number (#+ hex)]
              (collection [list "list/" Functor<List>]
-                         ["dict" dictionary #+ Dictionary]))
-       [macro #+ with-gensyms]
+                         ["dict" dictionary (#+ Dictionary)]))
+       [macro (#+ with-gensyms)]
        (macro [code]
-              ["s" syntax #+ syntax:])
+              ["s" syntax (#+ syntax:)])
        [host])
-  (////// (host ["_" scheme #+ Expression Computation])
+  (////// (host ["_" scheme (#+ Expression Computation)])
           [compiler]
-          (compiler [synthesis #+ Synthesis]))
-  [///runtime #+ Operation Translator])
+          (compiler [synthesis (#+ Synthesis)]))
+  [///runtime (#+ Operation Translator)])
 
 ## [Types]
 (type: #export Extension
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux
index 1ac433ec4..04ec5cae2 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/function.jvm.lux
@@ -1,18 +1,18 @@
 (.module:
-  [lux #- function]
-  (lux (control [monad #+ do]
+  [lux (#- function)]
+  (lux (control [monad (#+ do)]
                 pipe)
        (data [product]
              text/format
              (collection [list "list/" Functor<List>])))
-  (///// [reference #+ Register Variable]
+  (///// [reference (#+ Register Variable)]
          [name]
-         (host ["_" scheme #+ Expression Computation Var])
+         (host ["_" scheme (#+ Expression Computation Var)])
          [compiler "operation/" Monad<Operation>]
-         (compiler [analysis #+ Variant Tuple Environment Arity Abstraction Application Analysis]
-                   [synthesis #+ Synthesis]))
+         (compiler [analysis (#+ Variant Tuple Environment Arity Abstraction Application Analysis)]
+                   [synthesis (#+ Synthesis)]))
   [///]
-  [//runtime #+ Operation Translator]
+  [//runtime (#+ Operation Translator)]
   [//primitive]
   [//reference])
 
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux
index f77f7cf10..d78e9e965 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/loop.jvm.lux
@@ -1,16 +1,16 @@
 (.module:
-  [lux #- Scope]
-  (lux (control [monad #+ do])
+  [lux (#- Scope)]
+  (lux (control [monad (#+ do)])
        (data [product]
              [text]
              text/format
              (collection [list "list/" Functor<List>]))
        [macro])
-  (///// (host ["_" scheme #+ Computation Var])
+  (///// (host ["_" scheme (#+ Computation Var)])
          [compiler]
-         (compiler [synthesis #+ Scope Synthesis]))
+         (compiler [synthesis (#+ Scope Synthesis)]))
   [///]
-  [//runtime #+ Operation Translator]
+  [//runtime (#+ Operation Translator)]
   [//reference])
 
 (def: @scope (_.var "scope"))
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux
index e78df5b74..e0e7a2e54 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/primitive.jvm.lux
@@ -1,9 +1,9 @@
 (.module:
-  [lux #- i64]
-  [/// #+ State]
-  (///// [compiler #+ "operation/" Monad<Operation>]
-         (host ["_" scheme #+ Expression]))
-  [//runtime #+ Operation])
+  [lux (#- i64)]
+  [/// (#+ State)]
+  (///// [compiler "operation/" Monad<Operation>]
+         (host ["_" scheme (#+ Expression)]))
+  [//runtime (#+ Operation)])
 
 (def: #export bool
   (-> Bool (Operation Expression))
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux
index e1cb6a642..3d9b7eb85 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/reference.jvm.lux
@@ -2,13 +2,13 @@
   lux
   (lux (control pipe)
        (data text/format))
-  (///// [reference #+ Register Variable Reference]
+  (///// [reference (#+ Register Variable Reference)]
          [name]
-         (host ["_" scheme #+ Expression Var])
+         (host ["_" scheme (#+ Expression Var)])
          [compiler "operation/" Monad<Operation>]
-         (compiler [analysis #+ Variant Tuple]
-                   [synthesis #+ Synthesis]))
-  [//runtime #+ Operation Translator]
+         (compiler [analysis (#+ Variant Tuple)]
+                   [synthesis (#+ Synthesis)]))
+  [//runtime (#+ Operation Translator)]
   [//primitive])
 
 (do-template [<name> <prefix>]
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux
index 89707cdc4..9d22394d4 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/runtime.jvm.lux
@@ -1,18 +1,18 @@
 (.module:
   lux
   (lux (control ["p" parser "p/" Monad<Parser>]
-                [monad #+ do])
-       (data [number #+ hex]
+                [monad (#+ do)])
+       (data [number (#+ hex)]
              text/format
              (collection [list "list/" Monad<List>]))
        [function]
        (macro [code]
-              ["s" syntax #+ syntax:]))
-  [/// #+ State]
+              ["s" syntax (#+ syntax:)]))
+  [/// (#+ State)]
   (///// [name]
-         (host ["_" scheme #+ Expression Computation Var])
+         (host ["_" scheme (#+ Expression Computation Var)])
          [compiler]
-         (compiler [analysis #+ Variant]
+         (compiler [analysis (#+ Variant)]
                    [synthesis])))
 
 (type: #export Operation
diff --git a/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux b/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux
index c3b93e7a1..4db023b38 100644
--- a/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux
+++ b/stdlib/source/lux/language/compiler/translation/scheme/structure.jvm.lux
@@ -1,11 +1,11 @@
 (.module:
   lux
-  (lux (control [monad #+ do]))
-  (///// (host ["_" scheme #+ Expression])
+  (lux (control [monad (#+ do)]))
+  (///// (host ["_" scheme (#+ Expression)])
          [compiler]
-         (compiler [analysis #+ Variant Tuple]
-                   [synthesis #+ Synthesis]))
-  [//runtime #+ Operation Translator]
+         (compiler [analysis (#+ Variant Tuple)]
+                   [synthesis (#+ Synthesis)]))
+  [//runtime (#+ Operation Translator)]
   [//primitive])
 
 (def: #export (tuple translate elemsS+)
diff --git a/stdlib/source/lux/language/host/scheme.lux b/stdlib/source/lux/language/host/scheme.lux
index 93d1b2017..54043a82d 100644
--- a/stdlib/source/lux/language/host/scheme.lux
+++ b/stdlib/source/lux/language/host/scheme.lux
@@ -1,5 +1,5 @@
 (.module:
-  [lux #- Code' Code int or and if function cond when let]
+  [lux (#- Code' Code int or and if function cond when let)]
   (lux (control pipe)
        (data [text]
              text/format
diff --git a/stdlib/source/lux/language/module.lux b/stdlib/source/lux/language/module.lux
index dbb1cc0ea..41ae7877e 100644
--- a/stdlib/source/lux/language/module.lux
+++ b/stdlib/source/lux/language/module.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:]
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)]
                 pipe)
        (data [text "text/" Equivalence<Text>]
              text/format
diff --git a/stdlib/source/lux/language/reference.lux b/stdlib/source/lux/language/reference.lux
index 43c8f0d48..daa476553 100644
--- a/stdlib/source/lux/language/reference.lux
+++ b/stdlib/source/lux/language/reference.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux (control [equivalence #+ Equivalence]
-                [hash #+ Hash]
+  (lux (control [equivalence (#+ Equivalence)]
+                [hash (#+ Hash)]
                 pipe)))
 
 (type: #export Register Nat)
diff --git a/stdlib/source/lux/language/scope.lux b/stdlib/source/lux/language/scope.lux
index 9cb1de1c2..563007dfe 100644
--- a/stdlib/source/lux/language/scope.lux
+++ b/stdlib/source/lux/language/scope.lux
@@ -9,7 +9,7 @@
              (collection [list "list/" Functor<List> Fold<List> Monoid<List>]
                          (dictionary [plist])))
        [macro])
-  [//reference #+ Register Variable])
+  [//reference (#+ Register Variable)])
 
 (type: Locals (Bindings Text [Type Register]))
 (type: Foreign (Bindings Text [Type Variable]))
diff --git a/stdlib/source/lux/language/syntax.lux b/stdlib/source/lux/language/syntax.lux
index b9214ca11..6a92a7888 100644
--- a/stdlib/source/lux/language/syntax.lux
+++ b/stdlib/source/lux/language/syntax.lux
@@ -25,10 +25,10 @@
 ## (file-name, line, column) to keep track of their provenance and
 ## location, which is helpful for documentation and debugging.
 (.module:
-  [lux #- nat int rev]
+  [lux (#- nat int rev)]
   (lux (control monad
                 ["p" parser "p/" Monad<Parser>]
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data ["e" error]
              [number]
              [product]
@@ -36,8 +36,8 @@
              [text]
              (text ["l" lexer]
                    format)
-             (collection [row #+ Row]
-                         ["dict" dictionary #+ Dictionary]))))
+             (collection [row (#+ Row)]
+                         ["dict" dictionary (#+ Dictionary)]))))
 
 (type: #export Aliases (Dictionary Text Text))
 
diff --git a/stdlib/source/lux/language/type.lux b/stdlib/source/lux/language/type.lux
index b7e04afa4..8fecf55ca 100644
--- a/stdlib/source/lux/language/type.lux
+++ b/stdlib/source/lux/language/type.lux
@@ -1,16 +1,16 @@
 (.module: {#.doc "Basic functionality for working with types."}
-  [lux #- function]
-  (lux (control [equivalence #+ Equivalence]
-                [monad #+ do Monad]
+  [lux (#- function)]
+  (lux (control [equivalence (#+ Equivalence)]
+                [monad (#+ do Monad)]
                 ["p" parser])
        (data [text "text/" Monoid<Text> Equivalence<Text>]
              [ident "ident/" Equivalence<Ident> Codec<Text,Ident>]
              [number "nat/" Codec<Text,Nat>]
              [maybe]
-             (collection [list #+ "list/" Functor<List> Monoid<List> Fold<List>]))
+             (collection [list "list/" Functor<List> Monoid<List> Fold<List>]))
        [macro]
        (macro [code]
-              ["s" syntax #+ Syntax syntax:])
+              ["s" syntax (#+ Syntax syntax:)])
        ))
 
 ## [Utils]
diff --git a/stdlib/source/lux/language/type/check.lux b/stdlib/source/lux/language/type/check.lux
index 5fb8da617..b0bfbd643 100644
--- a/stdlib/source/lux/language/type/check.lux
+++ b/stdlib/source/lux/language/type/check.lux
@@ -1,15 +1,15 @@
 (.module: {#.doc "Type-checking functionality."}
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad]
-                ["ex" exception #+ exception:])
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)]
+                ["ex" exception (#+ exception:)])
        (data [text "text/" Monoid<Text> Equivalence<Text>]
              [number "nat/" Codec<Text,Nat>]
              [maybe]
              [product]
              (collection [list]
-                         [set #+ Set])
+                         [set (#+ Set)])
              ["e" error])
        (language [type "type/" Equivalence<Type>])
        ))
diff --git a/stdlib/source/lux/macro.lux b/stdlib/source/lux/macro.lux
index f55eb2392..b1a170079 100644
--- a/stdlib/source/lux/macro.lux
+++ b/stdlib/source/lux/macro.lux
@@ -1,8 +1,8 @@
 (.module: {#.doc "Functions for extracting information from the state of the compiler."}
   lux
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad])
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)])
        (data [number "nat/" Codec<Text,Nat>]
              [product]
              [ident "ident/" Codec<Text,Ident> Equivalence<Ident>]
diff --git a/stdlib/source/lux/macro/code.lux b/stdlib/source/lux/macro/code.lux
index cb977f36e..f16229460 100644
--- a/stdlib/source/lux/macro/code.lux
+++ b/stdlib/source/lux/macro/code.lux
@@ -1,9 +1,9 @@
 (.module:
-  [lux #- nat int rev]
-  (lux (control [equivalence #+ Equivalence])
+  [lux (#- nat int rev)]
+  (lux (control [equivalence (#+ Equivalence)])
        (data bool
              number
-             [text #+ Equivalence<Text> "text/" Monoid<Text>]
+             [text (#+ Equivalence<Text>) "text/" Monoid<Text>]
              ident
              (collection [list #* "" Functor<List> Fold<List>])
              )))
diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux
index 45e2aa900..82a18b66a 100644
--- a/stdlib/source/lux/macro/poly.lux
+++ b/stdlib/source/lux/macro/poly.lux
@@ -1,22 +1,22 @@
 (.module:
-  [lux #- function]
-  (lux (control [monad #+ do Monad]
+  [lux (#- function)]
+  (lux (control [monad (#+ do Monad)]
                 [equivalence]
                 ["p" parser]
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        [function]
        (data [text "text/" Monoid<Text>]
              (collection [list "list/" Fold<List> Monad<List> Monoid<List>]
-                         ["dict" dictionary #+ Dictionary])
+                         ["dict" dictionary (#+ Dictionary)])
              [number "nat/" Codec<Text,Nat>]
              [product]
              [bool]
              [maybe]
              [ident "ident/" Equivalence<Ident> Codec<Text,Ident>]
              ["e" error])
-       [macro #+ with-gensyms]
+       [macro (#+ with-gensyms)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax]
+              ["s" syntax (#+ syntax: Syntax)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))
diff --git a/stdlib/source/lux/macro/poly/equivalence.lux b/stdlib/source/lux/macro/poly/equivalence.lux
index 00ffa3257..e79c20ea6 100644
--- a/stdlib/source/lux/macro/poly/equivalence.lux
+++ b/stdlib/source/lux/macro/poly/equivalence.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["eq" equivalence]
                 ["p" parser])
        (data [text "text/" Monoid<Text>]
@@ -10,7 +10,7 @@
                          [array]
                          [queue]
                          [set]
-                         ["dict" dictionary #+ Dictionary]
+                         ["dict" dictionary (#+ Dictionary)]
                          (tree [rose]))
              [number "nat/" Codec<Text,Nat>]
              [product]
@@ -21,9 +21,9 @@
              ["i" instant])
        [macro]
        (macro [code]
-              [syntax #+ syntax: Syntax]
+              [syntax (#+ syntax: Syntax)]
               (syntax [common])
-              [poly #+ poly:])
+              [poly (#+ poly:)])
        (type [unit])
        (language [type])
        ))
diff --git a/stdlib/source/lux/macro/poly/functor.lux b/stdlib/source/lux/macro/poly/functor.lux
index ae1611c55..bc80ba646 100644
--- a/stdlib/source/lux/macro/poly/functor.lux
+++ b/stdlib/source/lux/macro/poly/functor.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 [functor]
                 ["p" parser])
        (data [text]
@@ -9,9 +9,9 @@
              [product])
        [macro]
        (macro [code]
-              [syntax #+ syntax: Syntax]
+              [syntax (#+ syntax: Syntax)]
               (syntax [common])
-              [poly #+ poly:])
+              [poly (#+ poly:)])
        (language [type])
        ))
 
diff --git a/stdlib/source/lux/macro/poly/json.lux b/stdlib/source/lux/macro/poly/json.lux
index 4ac28a2a5..32ccc001e 100644
--- a/stdlib/source/lux/macro/poly/json.lux
+++ b/stdlib/source/lux/macro/poly/json.lux
@@ -1,7 +1,7 @@
 (.module: {#.doc "Codecs for values in the JSON format."}
   lux
-  (lux (control [monad #+ do Monad]
-                [equivalence #+ Equivalence]
+  (lux (control [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)]
                 codec
                 ["p" parser "p/" Monad<Parser>])
        (data [bool]
@@ -15,16 +15,16 @@
              [sum]
              [product]
              (collection [list "list/" Fold<List> Monad<List>]
-                         [row #+ Row row "row/" Monad<Row>]
+                         [row (#+ Row row) "row/" Monad<Row>]
                          ["d" dictionary])
-             (format ["//" json #+ JSON]))
+             (format ["//" json (#+ JSON)]))
        (time ## ["i" instant]
              ["du" duration]
              ["da" date])
-       [macro #+ with-gensyms]
-       (macro ["s" syntax #+ syntax:]
+       [macro (#+ with-gensyms)]
+       (macro ["s" syntax (#+ syntax:)]
               [code]
-              [poly #+ poly:])
+              [poly (#+ poly:)])
        (type [unit])
        (language [type])
        ))
diff --git a/stdlib/source/lux/macro/syntax.lux b/stdlib/source/lux/macro/syntax.lux
index c333b3d8f..f689de0f6 100644
--- a/stdlib/source/lux/macro/syntax.lux
+++ b/stdlib/source/lux/macro/syntax.lux
@@ -1,8 +1,8 @@
 (.module:
-  [lux #- nat int rev]
-  (lux [macro #+ with-gensyms]
-       (control [monad #+ do Monad]
-                [equivalence #+ Equivalence]
+  [lux (#- nat int rev)]
+  (lux [macro (#+ with-gensyms)]
+       (control [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)]
                 ["p" parser])
        (data [bool]
              [number]
@@ -10,7 +10,7 @@
              [ident]
              (collection [list "list/" Functor<List>])
              [maybe]
-             [error #+ Error]))
+             [error (#+ Error)]))
   (// [code "code/" Equivalence<Code>]))
 
 ## [Utils]
diff --git a/stdlib/source/lux/macro/syntax/common.lux b/stdlib/source/lux/macro/syntax/common.lux
index 32e5118af..1ea1624da 100644
--- a/stdlib/source/lux/macro/syntax/common.lux
+++ b/stdlib/source/lux/macro/syntax/common.lux
@@ -1,7 +1,7 @@
 (.module: {#.doc "Commons syntax readers and writers.
 
                   The goal is to be able to reuse common syntax in macro definitions across libraries."}
-  [lux #- Definition])
+  [lux (#- Definition)])
 
 (type: #export Declaration
   {#declaration-name Text
diff --git a/stdlib/source/lux/macro/syntax/common/reader.lux b/stdlib/source/lux/macro/syntax/common/reader.lux
index 0db5f645b..63b185bd8 100644
--- a/stdlib/source/lux/macro/syntax/common/reader.lux
+++ b/stdlib/source/lux/macro/syntax/common/reader.lux
@@ -7,7 +7,7 @@
              [product]
              [maybe])
        [macro]
-       (macro ["s" syntax #+ syntax: Syntax]))
+       (macro ["s" syntax (#+ syntax: Syntax)]))
   [//])
 
 ## Exports
diff --git a/stdlib/source/lux/math.lux b/stdlib/source/lux/math.lux
index 66b35f320..d0e07f051 100644
--- a/stdlib/source/lux/math.lux
+++ b/stdlib/source/lux/math.lux
@@ -6,7 +6,7 @@
              [number]
              (collection [list "L/" Fold<List>]))
        [macro]
-       (macro ["s" syntax #+ syntax: Syntax]
+       (macro ["s" syntax (#+ syntax: Syntax)]
               [code])))
 
 ## [Values]
diff --git a/stdlib/source/lux/math/logic/fuzzy.lux b/stdlib/source/lux/math/logic/fuzzy.lux
index 5b31a6379..8d8c32eaf 100644
--- a/stdlib/source/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/lux/math/logic/fuzzy.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (data (collection [list]
-                         [set #+ Set])))
+                         [set (#+ Set)])))
   (// ["&" continuous]))
 
 (type: #export (Fuzzy a)
diff --git a/stdlib/source/lux/math/modular.lux b/stdlib/source/lux/math/modular.lux
index 15b7f5193..d6f5fd4b7 100644
--- a/stdlib/source/lux/math/modular.lux
+++ b/stdlib/source/lux/math/modular.lux
@@ -1,16 +1,16 @@
 (.module:
   lux
-  (lux (control ["ex" exception #+ exception:]
+  (lux (control ["ex" exception (#+ exception:)]
                 ["p" parser]
-                [codec #+ Codec]
-                [monad #+ do])
-       (data ["e" error #+ Error]
+                [codec (#+ Codec)]
+                [monad (#+ do)])
+       (data ["e" error (#+ Error)]
              [number "int/" Codec<Text,Int>]
              [text "text/" Monoid<Text>]
-             (text ["l" lexer #+ Lexer]))
+             (text ["l" lexer (#+ Lexer)]))
        (type abstract)
        (macro [code]
-              ["s" syntax #+ syntax:])
+              ["s" syntax (#+ syntax:)])
        [math]))
 
 (exception: #export zero-cannot-be-a-modulus)
diff --git a/stdlib/source/lux/math/random.lux b/stdlib/source/lux/math/random.lux
index 7a1fb7225..e9892d432 100644
--- a/stdlib/source/lux/math/random.lux
+++ b/stdlib/source/lux/math/random.lux
@@ -1,26 +1,26 @@
 (.module: {#.doc "Pseudo-random number generation (PRNG) algorithms."}
-  [lux #- list i64 nat int rev char]
-  (lux (control [functor #+ Functor]
-                [apply #+ Apply]
-                [monad #+ do Monad]
+  [lux (#- list i64 nat int rev char)]
+  (lux (control [functor (#+ Functor)]
+                [apply (#+ Apply)]
+                [monad (#+ do Monad)]
                 hash)
        (data [bit]
              [text "text/" Monoid<Text>]
-             (text [unicode #+ Char Segment])
+             (text [unicode (#+ Char Segment)])
              [product]
              [maybe]
-             [number #+ hex]
+             [number (#+ hex)]
              (number ["r" ratio]
                      ["c" complex])
              (collection [list "list/" Fold<List>]
                          [array]
-                         ["dict" dictionary #+ Dictionary]
-                         [queue #+ Queue]
-                         [set #+ Set]
-                         [stack #+ Stack]
-                         [row #+ Row]
-                         (tree [finger #+ Tree])))
-       (type [refinement #+ Refiner Refined])
+                         ["dict" dictionary (#+ Dictionary)]
+                         [queue (#+ Queue)]
+                         [set (#+ Set)]
+                         [stack (#+ Stack)]
+                         [row (#+ Row)]
+                         (tree [finger (#+ Tree)])))
+       (type [refinement (#+ Refiner Refined)])
        ))
 
 (type: #export #rec PRNG
diff --git a/stdlib/source/lux/test.lux b/stdlib/source/lux/test.lux
index bd804cfb0..d2cad6211 100644
--- a/stdlib/source/lux/test.lux
+++ b/stdlib/source/lux/test.lux
@@ -1,18 +1,18 @@
 (.module: {#.doc "Tools for unit & property-based/generative testing."}
   lux
-  (lux [macro #+ with-gensyms]
-       (macro ["s" syntax #+ syntax: Syntax]
+  (lux [macro (#+ with-gensyms)]
+       (macro ["s" syntax (#+ syntax: Syntax)]
               [code])
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 ["p" parser])
-       (concurrency [promise #+ Promise])
+       (concurrency [promise (#+ Promise)])
        (data [product]
              [maybe]
              ["e" error]
              [text]
              text/format
              (collection [list "list/" Monad<List> Fold<List>]))
-       [io #+ IO io]
+       [io (#+ IO io)]
        (time [instant]
              [duration])
        ["r" math/random]))
diff --git a/stdlib/source/lux/time/date.lux b/stdlib/source/lux/time/date.lux
index fe0cff9b8..046b3cd20 100644
--- a/stdlib/source/lux/time/date.lux
+++ b/stdlib/source/lux/time/date.lux
@@ -5,13 +5,13 @@
                 enum
                 codec
                 ["p" parser]
-                [monad #+ do])
+                [monad (#+ do)])
        (data ["e" error]
              [maybe]
              [number "int/" Codec<Text,Int>]
              [text "text/" Monoid<Text>]
              (text ["l" lexer])
-             (collection [row #+ Row row]))))
+             (collection [row (#+ Row row)]))))
 
 (type: #export Year Int)
 
diff --git a/stdlib/source/lux/time/duration.lux b/stdlib/source/lux/time/duration.lux
index b38dfa977..231b949c7 100644
--- a/stdlib/source/lux/time/duration.lux
+++ b/stdlib/source/lux/time/duration.lux
@@ -3,9 +3,9 @@
   (lux (control equivalence
                 order
                 codec
-                [monoid #+ Monoid]
+                [monoid (#+ Monoid)]
                 ["p" parser]
-                [monad #+ do])
+                [monad (#+ do)])
        (data [number "int/" Codec<Text,Int> Number<Int>]
              [text "text/" Monoid<Text>]
              (text ["l" lexer])
diff --git a/stdlib/source/lux/time/instant.lux b/stdlib/source/lux/time/instant.lux
index 1765c524e..727407a57 100644
--- a/stdlib/source/lux/time/instant.lux
+++ b/stdlib/source/lux/time/instant.lux
@@ -1,11 +1,11 @@
 (.module:
   lux
-  (lux [io #- run]
+  (lux [io (#- run)]
        (control equivalence
                 order
                 enum
                 codec
-                [monad #+ do Monad]
+                [monad (#+ do Monad)]
                 ["p" parser])
        (data [text "text/" Monoid<Text>]
              (text ["l" lexer])
@@ -13,7 +13,7 @@
              ["e" error]
              [maybe]
              (collection [list "L/" Fold<List> Functor<List>]
-                         [row #+ Row row "row/" Functor<Row> Fold<Row>]))
+                         [row (#+ Row row) "row/" Functor<Row> Fold<Row>]))
        (type abstract))
   (// [duration "duration/" Order<Duration>]
       [date]))
diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/lux/type/abstract.lux
index 10095805f..226ce491a 100644
--- a/stdlib/source/lux/type/abstract.lux
+++ b/stdlib/source/lux/type/abstract.lux
@@ -1,17 +1,17 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser])
        (data [text "text/" Equivalence<Text> Monoid<Text>]
              [error]
              (collection [list "list/" Functor<List> Monoid<List>]))
-       [macro #+ "meta/" Monad<Meta>]
+       [macro "meta/" Monad<Meta>]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))
-       (language [type #+ :cast])))
+       (language [type (#+ :cast)])))
 
 (def: (get k plist)
   (All [a]
diff --git a/stdlib/source/lux/type/implicit.lux b/stdlib/source/lux/type/implicit.lux
index 12dee41b4..94b81f409 100644
--- a/stdlib/source/lux/type/implicit.lux
+++ b/stdlib/source/lux/type/implicit.lux
@@ -1,21 +1,21 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["eq" equivalence]
                 ["p" parser])
        (data [text "text/" Equivalence<Text>]
              text/format
              [number]
              (collection [list "list/" Monad<List> Fold<List>]
-                         ["dict" dictionary #+ Dictionary])
+                         ["dict" dictionary (#+ Dictionary)])
              [bool]
              [product]
              [maybe])
-       [macro #+ Monad<Meta>]
+       [macro (#+ Monad<Meta>)]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax])
+              ["s" syntax (#+ syntax: Syntax)])
        (language [type]
-                 (type ["tc" check #+ Check]))
+                 (type ["tc" check (#+ Check)]))
        ))
 
 (def: (find-type-var id env)
diff --git a/stdlib/source/lux/type/object/interface.lux b/stdlib/source/lux/type/object/interface.lux
index d6a31d1f8..8ff12d167 100644
--- a/stdlib/source/lux/type/object/interface.lux
+++ b/stdlib/source/lux/type/object/interface.lux
@@ -1,17 +1,17 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser "p/" Monad<Parser>])
        (data [text]
              text/format
              [product]
              [maybe]
-             [ident #+ "ident/" Equivalence<Ident>]
+             [ident "ident/" Equivalence<Ident>]
              (collection [list "list/" Functor<List> Fold<List> Monoid<List>]
-                         [set #+ Set]))
-       [macro #+ Monad<Meta> "meta/" Monad<Meta>]
+                         [set (#+ Set)]))
+       [macro (#+ Monad<Meta>) "meta/" Monad<Meta>]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))
diff --git a/stdlib/source/lux/type/object/protocol.lux b/stdlib/source/lux/type/object/protocol.lux
index 5407b8f3f..87c7d4207 100644
--- a/stdlib/source/lux/type/object/protocol.lux
+++ b/stdlib/source/lux/type/object/protocol.lux
@@ -1,12 +1,12 @@
 (.module:
   lux
   (lux (control ["p" parser]
-                [monad #+ do])
+                [monad (#+ do)])
        (data [sum]
              (collection [list "list/" Functor<List>]))
        [macro "meta/" Monad<Meta>]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))))
diff --git a/stdlib/source/lux/type/quotient.lux b/stdlib/source/lux/type/quotient.lux
index 958e5eda9..99e750a93 100644
--- a/stdlib/source/lux/type/quotient.lux
+++ b/stdlib/source/lux/type/quotient.lux
@@ -1,12 +1,12 @@
 (.module:
-  [lux #- type]
-  (lux (control [monad #+ do]
+  [lux (#- type)]
+  (lux (control [monad (#+ do)]
                 ["p" parser])
-       (data ["e" error #+ Error])
+       (data ["e" error (#+ Error)])
        (language [type])
        (type abstract)
        [macro]
-       (macro ["s" syntax #+ syntax:]
+       (macro ["s" syntax (#+ syntax:)]
               [poly])))
 
 (abstract: #export (Class t c q)
diff --git a/stdlib/source/lux/type/refinement.lux b/stdlib/source/lux/type/refinement.lux
index d7de1a67a..3652764d4 100644
--- a/stdlib/source/lux/type/refinement.lux
+++ b/stdlib/source/lux/type/refinement.lux
@@ -1,13 +1,13 @@
 (.module:
-  [lux #- type]
-  (lux (control [predicate #+ Predicate]
-                [monad #+ do]
+  [lux (#- type)]
+  (lux (control [predicate (#+ Predicate)]
+                [monad (#+ do)]
                 ["p" parser])
-       (data ["e" error #+ Error])
+       (data ["e" error (#+ Error)])
        (language [type "type/" Equivalence<Type>])
        (type abstract)
        [macro]
-       (macro ["s" syntax #+ syntax:]
+       (macro ["s" syntax (#+ syntax:)]
               [poly])))
 
 (abstract: #export (Refined t r)
diff --git a/stdlib/source/lux/type/resource.lux b/stdlib/source/lux/type/resource.lux
index 636939a1b..f01ce53c9 100644
--- a/stdlib/source/lux/type/resource.lux
+++ b/stdlib/source/lux/type/resource.lux
@@ -1,23 +1,23 @@
 (.module:
   lux
   (lux (control ["p" parser]
-                ["ex" exception #+ exception:]
-                [monad #+ Monad do]
-                (monad [indexed #+ IxMonad]))
-       (data [identity #+ Identity]
+                ["ex" exception (#+ exception:)]
+                [monad (#+ Monad do)]
+                (monad [indexed (#+ IxMonad)]))
+       (data [identity (#+ Identity)]
              [maybe]
              [product]
              [number]
              text/format
-             (collection ["dict" dictionary #+ Dictionary]
+             (collection ["dict" dictionary (#+ Dictionary)]
                          [set]
-                         [row #+ Row]
+                         [row (#+ Row)]
                          [list "list/" Functor<List> Fold<List>]))
-       (concurrency [promise #+ Promise])
+       (concurrency [promise (#+ Promise)])
        [macro]
-       (macro ["s" syntax #+ Syntax syntax:])
+       (macro ["s" syntax (#+ Syntax syntax:)])
        (type abstract)
-       [io #+ IO]))
+       [io (#+ IO)]))
 
 (type: #export (Procedure monad input output value)
   (-> input (monad [output value])))
diff --git a/stdlib/source/lux/type/unit.lux b/stdlib/source/lux/type/unit.lux
index 9a5c2d054..3668d492a 100644
--- a/stdlib/source/lux/type/unit.lux
+++ b/stdlib/source/lux/type/unit.lux
@@ -1,15 +1,15 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 ["p" parser "p/" Monad<Parser>]
-                [equivalence #+ Equivalence]
-                [order #+ Order]
-                [enum #+ Enum])
+                [equivalence (#+ Equivalence)]
+                [order (#+ Order)]
+                [enum (#+ Enum)])
        (data text/format
              (number ["r" ratio]))
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax:]
+              ["s" syntax (#+ syntax:)]
               (syntax ["cs" common]
                       (common ["csr" reader]
                               ["csw" writer])))
diff --git a/stdlib/source/lux/world/blob.jvm.lux b/stdlib/source/lux/world/blob.jvm.lux
index 67bfded53..a9f640b37 100644
--- a/stdlib/source/lux/world/blob.jvm.lux
+++ b/stdlib/source/lux/world/blob.jvm.lux
@@ -1,13 +1,13 @@
 (.module:
-  [lux #- i64]
-  (lux (control [monad #+ do]
-                ["ex" exception #+ exception:]
+  [lux (#- i64)]
+  (lux (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)]
                 ["eq" equivalence])
        (data [bit]
              [maybe]
-             [error #+ Error]
+             [error (#+ Error)]
              text/format)
-       [host #+ import:]))
+       [host (#+ import:)]))
 
 (exception: #export (index-out-of-bounds {description Text})
   description)
diff --git a/stdlib/source/lux/world/console.lux b/stdlib/source/lux/world/console.lux
index 87e362a41..6ab7dd4a6 100644
--- a/stdlib/source/lux/world/console.lux
+++ b/stdlib/source/lux/world/console.lux
@@ -1,12 +1,12 @@
 (.module:
   lux
-  (lux (control [monad #+ do])
+  (lux (control [monad (#+ do)])
        (data ["e" error]
              [text])
        (concurrency [promise]
-                    [task #+ Task])
+                    [task (#+ Task)])
        (type (object interface))
-       [io #+ IO Process io]
+       [io (#+ IO Process io)]
        [host]))
 
 (interface: #export Console
diff --git a/stdlib/source/lux/world/environment.jvm.lux b/stdlib/source/lux/world/environment.jvm.lux
index 7f1340043..f975a59d9 100644
--- a/stdlib/source/lux/world/environment.jvm.lux
+++ b/stdlib/source/lux/world/environment.jvm.lux
@@ -1,9 +1,9 @@
 (.module:
   lux
   (lux (data [text]
-             (format [context #+ Context])
+             (format [context (#+ Context)])
              (collection [dictionary]))
-       [io #- run]
+       [io (#- run)]
        [host]))
 
 (host.import: java/lang/String)
diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux
index 3ff1fc4a8..8c71678cd 100644
--- a/stdlib/source/lux/world/file.lux
+++ b/stdlib/source/lux/world/file.lux
@@ -1,16 +1,16 @@
 (.module:
   lux
-  (lux (control [monad #+ Monad do]
-                ["ex" exception #+ Exception exception:]
+  (lux (control [monad (#+ Monad do)]
+                ["ex" exception (#+ Exception exception:)]
                 pipe)
-       (data [error #+ Error]
+       (data [error (#+ Error)]
              text/format
              (collection [array]))
-       (time [instant #+ Instant]
+       (time [instant (#+ Instant)]
              [duration])
-       (world [blob #+ Blob])
-       [io #+ Process]
-       [host #+ import:]
+       (world [blob (#+ Blob)])
+       [io (#+ Process)]
+       [host (#+ import:)]
        [language/host]))
 
 (type: #export File Text)
diff --git a/stdlib/source/lux/world/net/tcp.jvm.lux b/stdlib/source/lux/world/net/tcp.jvm.lux
index 539a1f8c6..0c62844ce 100644
--- a/stdlib/source/lux/world/net/tcp.jvm.lux
+++ b/stdlib/source/lux/world/net/tcp.jvm.lux
@@ -1,13 +1,13 @@
 (.module:
   lux
   (lux (control monad)
-       (concurrency [promise #+ Promise promise]
-                    [task #+ Task]
+       (concurrency [promise (#+ Promise promise)]
+                    [task (#+ Task)]
                     [frp])
        (data ["e" error])
        (type abstract)
-       (world [blob #+ Blob])
-       [io #+ Process]
+       (world [blob (#+ Blob)])
+       [io (#+ Process)]
        [host])
   [//])
 
diff --git a/stdlib/source/lux/world/net/udp.jvm.lux b/stdlib/source/lux/world/net/udp.jvm.lux
index 527d957c6..f8ad6885b 100644
--- a/stdlib/source/lux/world/net/udp.jvm.lux
+++ b/stdlib/source/lux/world/net/udp.jvm.lux
@@ -1,14 +1,14 @@
 (.module:
   lux
   (lux (control monad
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (concurrency ["P" promise]
                     ["T" task])
        (data ["e" error]
              [maybe]
              (collection [array]))
        (type abstract)
-       (world [blob #+ Blob])
+       (world [blob (#+ Blob)])
        [io]
        [host])
   [//])
diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index ec3c82197..4afb041fe 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   lux/test
-  (lux (control [monad #+ do])
+  (lux (control [monad (#+ do)])
        [math]
        ["r" math/random]
        (data [maybe]
@@ -9,7 +9,7 @@
              [text "text/" Equivalence<Text>]
              text/format)
        [macro]
-       (macro ["s" syntax #+ syntax:])))
+       (macro ["s" syntax (#+ syntax:)])))
 
 (context: "Value identity."
   (<| (times +100)
diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux
index bd0ed72d8..f52f0d498 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/test/test/lux/cli.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 pipe
                 ["p" parser])
        (data [product]
diff --git a/stdlib/test/test/lux/concurrency/actor.lux b/stdlib/test/test/lux/concurrency/actor.lux
index dc924de27..54f60b740 100644
--- a/stdlib/test/test/lux/concurrency/actor.lux
+++ b/stdlib/test/test/lux/concurrency/actor.lux
@@ -1,14 +1,14 @@
 (.module:
   lux
-  (lux [io #+ IO io]
-       (control ["M" monad #+ do Monad]
+  (lux [io (#+ IO io)]
+       (control ["M" monad (#+ do Monad)]
                 ["ex" exception])
        (data [number]
              text/format
              ["e" error])
        (concurrency ["P" promise "P/" Monad<Promise>]
                     ["T" task]
-                    ["&" actor #+ actor: message:]))
+                    ["&" actor (#+ actor: message:)]))
   lux/test)
 
 (actor: Counter
diff --git a/stdlib/test/test/lux/concurrency/atom.lux b/stdlib/test/test/lux/concurrency/atom.lux
index b6c220b28..36dc59074 100644
--- a/stdlib/test/test/lux/concurrency/atom.lux
+++ b/stdlib/test/test/lux/concurrency/atom.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad])
+       (control ["M" monad (#+ do Monad)])
        (data [number]
              (collection [list "" Functor<List>])
              text/format)
diff --git a/stdlib/test/test/lux/concurrency/frp.lux b/stdlib/test/test/lux/concurrency/frp.lux
index 7760ad806..6996997f1 100644
--- a/stdlib/test/test/lux/concurrency/frp.lux
+++ b/stdlib/test/test/lux/concurrency/frp.lux
@@ -1,13 +1,13 @@
 (.module:
   lux
-  (lux [io #+ IO io]
-       (control [monad #+ do Monad])
+  (lux [io (#+ IO io)]
+       (control [monad (#+ do Monad)])
        (data [number]
              text/format
              (collection [list]))
-       (concurrency [promise #+ "promise/" Monad<Promise>]
-                    [frp #+ Channel]
-                    [atom #+ Atom atom]))
+       (concurrency [promise "promise/" Monad<Promise>]
+                    [frp (#+ Channel)]
+                    [atom (#+ Atom atom)]))
   lux/test)
 
 (def: (write! values channel)
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index 37ba6f2e1..77f69dd46 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux [io #+ IO io]
-       (control ["M" monad #+ do Monad]
+  (lux [io (#+ IO io)]
+       (control ["M" monad (#+ do Monad)]
                 pipe)
        (data [number]
              text/format)
diff --git a/stdlib/test/test/lux/concurrency/semaphore.lux b/stdlib/test/test/lux/concurrency/semaphore.lux
index 294f2c5e2..6eb1752a6 100644
--- a/stdlib/test/test/lux/concurrency/semaphore.lux
+++ b/stdlib/test/test/lux/concurrency/semaphore.lux
@@ -1,13 +1,13 @@
 (.module:
   lux
-  (lux (control [monad #+ do])
+  (lux (control [monad (#+ do)])
        (data [maybe]
              [text "text/" Equivalence<Text> Monoid<Text>]
              text/format
              (collection [list "list/" Functor<List>]))
        (concurrency ["/" semaphore]
-                    [promise #+ Promise]
-                    [atom #+ Atom])
+                    [promise (#+ Promise)]
+                    [atom (#+ Atom)])
        [io]
        ["r" math/random])
   lux/test)
diff --git a/stdlib/test/test/lux/concurrency/stm.lux b/stdlib/test/test/lux/concurrency/stm.lux
index 23dbb6850..a9c9f4420 100644
--- a/stdlib/test/test/lux/concurrency/stm.lux
+++ b/stdlib/test/test/lux/concurrency/stm.lux
@@ -1,15 +1,15 @@
 (.module:
   lux
-  (lux [io #+ IO]
-       (control ["M" monad #+ do Monad])
+  (lux [io (#+ IO)]
+       (control ["M" monad (#+ do Monad)])
        (data [number]
              [maybe]
-             (collection [list "" Functor<List> "List/" Fold<List>])
+             (collection [list "" Functor<List>])
              text/format)
-       (concurrency [atom #+ Atom atom]
+       (concurrency [atom (#+ Atom atom)]
                     ["&" stm]
                     [promise]
-                    [frp #+ Channel])
+                    [frp (#+ Channel)])
        ["r" math/random])
   lux/test)
 
diff --git a/stdlib/test/test/lux/control/continuation.lux b/stdlib/test/test/lux/control/continuation.lux
index c5fa339d0..0df6d497d 100644
--- a/stdlib/test/test/lux/control/continuation.lux
+++ b/stdlib/test/test/lux/control/continuation.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 ["&" continuation])
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/control/equivalence.lux b/stdlib/test/test/lux/control/equivalence.lux
index 18265af6c..5fd317fe4 100644
--- a/stdlib/test/test/lux/control/equivalence.lux
+++ b/stdlib/test/test/lux/control/equivalence.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux (control ["/" equivalence]
-                [monad #+ do])
+                [monad (#+ do)])
        (math ["r" random])
        test))
 
diff --git a/stdlib/test/test/lux/control/exception.lux b/stdlib/test/test/lux/control/exception.lux
index dfd55abd4..dc768633c 100644
--- a/stdlib/test/test/lux/control/exception.lux
+++ b/stdlib/test/test/lux/control/exception.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
-                ["&" exception #+ exception:])
+       (control ["M" monad (#+ do Monad)]
+                ["&" exception (#+ exception:)])
        (data ["E" error]
              [text]
              text/format
diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/test/test/lux/control/interval.lux
index 99dd14b4e..c836dacda 100644
--- a/stdlib/test/test/lux/control/interval.lux
+++ b/stdlib/test/test/lux/control/interval.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   lux/test
-  (lux (control ["M" monad #+ do Monad]
+  (lux (control ["M" monad (#+ do Monad)]
                 pipe
                 ["&" interval])
        [io]
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux
index c7293c2ee..1f8e8ce73 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/test/test/lux/control/parser.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
-                [equivalence #+ Equivalence]
+       (control ["M" monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)]
                 ["&" parser]
                 pipe)
        (data [text "Text/" Monoid<Text>]
@@ -14,7 +14,7 @@
        ["r" math/random]
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax:]))
+              ["s" syntax (#+ syntax:)]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/control/pipe.lux b/stdlib/test/test/lux/control/pipe.lux
index 1288b5302..081c4d308 100644
--- a/stdlib/test/test/lux/control/pipe.lux
+++ b/stdlib/test/test/lux/control/pipe.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data text/format
              [number]
diff --git a/stdlib/test/test/lux/control/reader.lux b/stdlib/test/test/lux/control/reader.lux
index eba19b47b..82fbb71c1 100644
--- a/stdlib/test/test/lux/control/reader.lux
+++ b/stdlib/test/test/lux/control/reader.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe
                 ["&" reader])
        (data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/control/region.lux b/stdlib/test/test/lux/control/region.lux
index d0a2fb11d..abfe25985 100644
--- a/stdlib/test/test/lux/control/region.lux
+++ b/stdlib/test/test/lux/control/region.lux
@@ -1,10 +1,10 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
+  (lux (control [monad (#+ do)]
                 ["/" region]
-                [thread #+ Thread]
-                ["ex" exception #+ exception:])
-       (data ["e" error #+ Error]
+                [thread (#+ Thread)]
+                ["ex" exception (#+ exception:)])
+       (data ["e" error (#+ Error)]
              (collection [list])
              text/format)
        ["r" math/random])
diff --git a/stdlib/test/test/lux/control/state.lux b/stdlib/test/test/lux/control/state.lux
index 1194351e5..72fa13273 100644
--- a/stdlib/test/test/lux/control/state.lux
+++ b/stdlib/test/test/lux/control/state.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 pipe
                 ["&" state])
        (data [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/control/thread.lux b/stdlib/test/test/lux/control/thread.lux
index 3dd27d0ad..f1e9673e3 100644
--- a/stdlib/test/test/lux/control/thread.lux
+++ b/stdlib/test/test/lux/control/thread.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
+  (lux (control [monad (#+ do)]
                 ["/" thread])))
 
 (def: _test0_
diff --git a/stdlib/test/test/lux/control/writer.lux b/stdlib/test/test/lux/control/writer.lux
index 35df0ae06..1b9cba738 100644
--- a/stdlib/test/test/lux/control/writer.lux
+++ b/stdlib/test/test/lux/control/writer.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 pipe
                 ["&" writer])
        (data [text "Text/" Monoid<Text> Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/test/test/lux/data/bit.lux
index 9008f89cf..158c1d218 100644
--- a/stdlib/test/test/lux/data/bit.lux
+++ b/stdlib/test/test/lux/data/bit.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad])
+       (control ["M" monad (#+ do Monad)])
        (data ["&" bit]
              number)
        ["r" math/random])
diff --git a/stdlib/test/test/lux/data/bool.lux b/stdlib/test/test/lux/data/bool.lux
index ead88f0db..fb5db77df 100644
--- a/stdlib/test/test/lux/data/bool.lux
+++ b/stdlib/test/test/lux/data/bool.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control ["M" monad #+ do Monad])
+  (lux (control ["M" monad (#+ do Monad)])
        [io]
        (data bool)
        ["r" math/random])
diff --git a/stdlib/test/test/lux/data/collection/array.lux b/stdlib/test/test/lux/data/collection/array.lux
index 1e083676c..769a7a215 100644
--- a/stdlib/test/test/lux/data/collection/array.lux
+++ b/stdlib/test/test/lux/data/collection/array.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 pipe)
        [io]
        (data (collection ["@" array]
diff --git a/stdlib/test/test/lux/data/collection/bits.lux b/stdlib/test/test/lux/data/collection/bits.lux
index bef677ad5..8e1d672d7 100644
--- a/stdlib/test/test/lux/data/collection/bits.lux
+++ b/stdlib/test/test/lux/data/collection/bits.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
+  (lux (control [monad (#+ do)]
                 [predicate])
        (data (collection ["/" bits]))
        ["r" math/random])
diff --git a/stdlib/test/test/lux/data/collection/dictionary.lux b/stdlib/test/test/lux/data/collection/dictionary.lux
index 5b18c863f..89121c106 100644
--- a/stdlib/test/test/lux/data/collection/dictionary.lux
+++ b/stdlib/test/test/lux/data/collection/dictionary.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 ["eq" equivalence])
        (data [text]
              text/format
diff --git a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
index a5b680037..a70244160 100644
--- a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
-                [equivalence #+ Equivalence])
+       (control [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)])
        (data [product]
              [number]
              (collection ["s" set]
diff --git a/stdlib/test/test/lux/data/collection/list.lux b/stdlib/test/test/lux/data/collection/list.lux
index 90d3cfc67..940273ba1 100644
--- a/stdlib/test/test/lux/data/collection/list.lux
+++ b/stdlib/test/test/lux/data/collection/list.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data (collection ["&" list])
              [number]
diff --git a/stdlib/test/test/lux/data/collection/queue.lux b/stdlib/test/test/lux/data/collection/queue.lux
index 8160c9d82..a28196c8a 100644
--- a/stdlib/test/test/lux/data/collection/queue.lux
+++ b/stdlib/test/test/lux/data/collection/queue.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data (collection ["&" queue])
              [number])
        ["r" math/random])
diff --git a/stdlib/test/test/lux/data/collection/queue/priority.lux b/stdlib/test/test/lux/data/collection/queue/priority.lux
index d1880a735..a6f62a69b 100644
--- a/stdlib/test/test/lux/data/collection/queue/priority.lux
+++ b/stdlib/test/test/lux/data/collection/queue/priority.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data (collection (queue ["&" priority]))
              [number]
              [maybe])
diff --git a/stdlib/test/test/lux/data/collection/row.lux b/stdlib/test/test/lux/data/collection/row.lux
index 709d8b44e..0e861f0d8 100644
--- a/stdlib/test/test/lux/data/collection/row.lux
+++ b/stdlib/test/test/lux/data/collection/row.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data (collection ["&" row]
                          [list "list/" Fold<List>])
              [number]
diff --git a/stdlib/test/test/lux/data/collection/sequence.lux b/stdlib/test/test/lux/data/collection/sequence.lux
index a168d749f..9f45c36d6 100644
--- a/stdlib/test/test/lux/data/collection/sequence.lux
+++ b/stdlib/test/test/lux/data/collection/sequence.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 comonad)
        (data [maybe]
              [text "Text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/collection/set.lux b/stdlib/test/test/lux/data/collection/set.lux
index 346f1a39b..35a41b06d 100644
--- a/stdlib/test/test/lux/data/collection/set.lux
+++ b/stdlib/test/test/lux/data/collection/set.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
-       (data (collection ["&" set #+ Set]
+       (control [monad (#+ do Monad)])
+       (data (collection ["&" set (#+ Set)]
                          [list "" Fold<List>])
              [number])
        ["r" math/random])
diff --git a/stdlib/test/test/lux/data/collection/set/ordered.lux b/stdlib/test/test/lux/data/collection/set/ordered.lux
index 455ea5cb2..ab4cdd8d3 100644
--- a/stdlib/test/test/lux/data/collection/set/ordered.lux
+++ b/stdlib/test/test/lux/data/collection/set/ordered.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data (collection [set]
                          (set ["&" ordered])
                          [list "" Fold<List>])
diff --git a/stdlib/test/test/lux/data/collection/stack.lux b/stdlib/test/test/lux/data/collection/stack.lux
index c4e5f58a3..a60cc6004 100644
--- a/stdlib/test/test/lux/data/collection/stack.lux
+++ b/stdlib/test/test/lux/data/collection/stack.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data (collection ["&" stack]
                          [list "" Fold<List>])
              [number]
diff --git a/stdlib/test/test/lux/data/collection/tree/rose.lux b/stdlib/test/test/lux/data/collection/tree/rose.lux
index b83c3e675..282e1c009 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose.lux
+++ b/stdlib/test/test/lux/data/collection/tree/rose.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data [product]
              [number]
              [text "T/" Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
index 3a1a9ed7a..2a0b1f365 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
+++ b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data (collection [list "list/" Fold<List> Functor<List>]
                          (tree [rose]
diff --git a/stdlib/test/test/lux/data/color.lux b/stdlib/test/test/lux/data/color.lux
index 776862749..c321d26d9 100644
--- a/stdlib/test/test/lux/data/color.lux
+++ b/stdlib/test/test/lux/data/color.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do])
+       (control [monad (#+ do)])
        (data ["@" color]
              [number "frac/" Number<Frac>])
        [math]
diff --git a/stdlib/test/test/lux/data/error.lux b/stdlib/test/test/lux/data/error.lux
index ed7b6cc58..733be1cc6 100644
--- a/stdlib/test/test/lux/data/error.lux
+++ b/stdlib/test/test/lux/data/error.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 pipe)
        (data text/format
              ["&" error]))
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 40aaf97d2..9929e1567 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -1,9 +1,9 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 codec
-                [equivalence #+ Equivalence]
+                [equivalence (#+ Equivalence)]
                 pipe
                 ["p" parser])
        (data [text]
@@ -13,13 +13,13 @@
              [maybe]
              [number]
              (format ["@" json])
-             (collection [row #+ row]
+             (collection [row (#+ row)]
                          ["d" dictionary]
                          [list]))
-       [macro #+ with-gensyms]
+       [macro (#+ with-gensyms)]
        (macro [code]
-              [syntax #+ syntax:]
-              [poly #+ derived:]
+              [syntax (#+ syntax:)]
+              [poly (#+ derived:)]
               [poly/equivalence]
               [poly/json])
        (type [unit])
diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/test/test/lux/data/format/xml.lux
index a6f57d6b1..4f14650b3 100644
--- a/stdlib/test/test/lux/data/format/xml.lux
+++ b/stdlib/test/test/lux/data/format/xml.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 ["p" parser]
                 pipe)
        (data [text "text/" Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/ident.lux b/stdlib/test/test/lux/data/ident.lux
index b1e4c8490..abb8a5d5c 100644
--- a/stdlib/test/test/lux/data/ident.lux
+++ b/stdlib/test/test/lux/data/ident.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data ["&" ident]
              [text "text/" Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/identity.lux b/stdlib/test/test/lux/data/identity.lux
index 479ec5670..df68144e4 100644
--- a/stdlib/test/test/lux/data/identity.lux
+++ b/stdlib/test/test/lux/data/identity.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 comonad)
        (data ["&" identity]
              [text "Text/" Monoid<Text> Equivalence<Text>]))
diff --git a/stdlib/test/test/lux/data/lazy.lux b/stdlib/test/test/lux/data/lazy.lux
index da28003ba..e6a266b4a 100644
--- a/stdlib/test/test/lux/data/lazy.lux
+++ b/stdlib/test/test/lux/data/lazy.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data ["&" lazy])
        ["r" math/random])
   lux/test)
diff --git a/stdlib/test/test/lux/data/maybe.lux b/stdlib/test/test/lux/data/maybe.lux
index 8353461b7..188db2b20 100644
--- a/stdlib/test/test/lux/data/maybe.lux
+++ b/stdlib/test/test/lux/data/maybe.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 pipe)
        (data ["&" maybe]
              [text "text/" Monoid<Text>]
diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/test/test/lux/data/number.lux
index 4afba422a..7cdbe5848 100644
--- a/stdlib/test/test/lux/data/number.lux
+++ b/stdlib/test/test/lux/data/number.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 pipe)
        (data number
              [text "Text/" Monoid<Text> Equivalence<Text>]
diff --git a/stdlib/test/test/lux/data/number/complex.lux b/stdlib/test/test/lux/data/number/complex.lux
index d75cbc428..17cd07278 100644
--- a/stdlib/test/test/lux/data/number/complex.lux
+++ b/stdlib/test/test/lux/data/number/complex.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data [product]
              [number "frac/" Number<Frac>]
diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux
index c96c6f5ca..9802ac3b2 100644
--- a/stdlib/test/test/lux/data/number/ratio.lux
+++ b/stdlib/test/test/lux/data/number/ratio.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data ["&" number/ratio "&/" Number<Ratio>])
        ["r" math/random])
diff --git a/stdlib/test/test/lux/data/product.lux b/stdlib/test/test/lux/data/product.lux
index 0bf0cdedd..11e574cc2 100644
--- a/stdlib/test/test/lux/data/product.lux
+++ b/stdlib/test/test/lux/data/product.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad])
+       (control ["M" monad (#+ do Monad)])
        (data product
              [text "Text/" Monoid<Text>]
              [number]))
diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/test/test/lux/data/sum.lux
index 6ef7ce2bc..1b73fb627 100644
--- a/stdlib/test/test/lux/data/sum.lux
+++ b/stdlib/test/test/lux/data/sum.lux
@@ -1,8 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
-                pipe)
+       (control pipe)
        (data sum
              [text "Text/" Monoid<Text>]
              [number]
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux
index 9c5f317f8..edd3fa8a6 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/test/test/lux/data/text.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data ["&" text]
              text/format
diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux
index 2ce811b33..81304af36 100644
--- a/stdlib/test/test/lux/data/text/format.lux
+++ b/stdlib/test/test/lux/data/text/format.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data text/format
              [text]
              [number]))
diff --git a/stdlib/test/test/lux/data/text/lexer.lux b/stdlib/test/test/lux/data/text/lexer.lux
index 31b9dcc40..b13605054 100644
--- a/stdlib/test/test/lux/data/text/lexer.lux
+++ b/stdlib/test/test/lux/data/text/lexer.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do Monad]
+  (lux (control [monad (#+ do Monad)]
                 pipe
                 ["p" parser])
        [io]
diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/test/test/lux/data/text/regex.lux
index cab2b168b..7233c7308 100644
--- a/stdlib/test/test/lux/data/text/regex.lux
+++ b/stdlib/test/test/lux/data/text/regex.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe
                 ["p" parser])
        (data [product]
@@ -11,7 +11,7 @@
                    ["&" regex]))
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax:])
+              ["s" syntax (#+ syntax:)])
        ["r" math/random])
   lux/test)
 
diff --git a/stdlib/test/test/lux/host.js.lux b/stdlib/test/test/lux/host.js.lux
index 49b15d7e4..8e301bdaa 100644
--- a/stdlib/test/test/lux/host.js.lux
+++ b/stdlib/test/test/lux/host.js.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad])
+       (control ["M" monad (#+ do Monad)])
        (data text/format)
        ["&" host]
        ["r" math/random])
diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/test/test/lux/host.jvm.lux
index c9c59e8d2..5096f3200 100644
--- a/stdlib/test/test/lux/host.jvm.lux
+++ b/stdlib/test/test/lux/host.jvm.lux
@@ -1,13 +1,13 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data text/format
              [number]
              [product]
              [text "text/" Equivalence<Text>])
-       ["&" host #+ class: interface: object]
+       ["&" host (#+ class: interface: object)]
        ["r" math/random])
   lux/test)
 
diff --git a/stdlib/test/test/lux/io.lux b/stdlib/test/test/lux/io.lux
index 768bc3166..f4c1bbf68 100644
--- a/stdlib/test/test/lux/io.lux
+++ b/stdlib/test/test/lux/io.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux ["&" io]
-       (control ["M" monad #+ do Monad])
+       (control ["M" monad (#+ do Monad)])
        (data [text "Text/" Monoid<Text> Equivalence<Text>]
              text/format
              [number]))
diff --git a/stdlib/test/test/lux/language/compiler/analysis/case.lux b/stdlib/test/test/lux/language/compiler/analysis/case.lux
index ef54a66c1..e69e4d9d5 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/case.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (data [bool "B/" Equivalence<Bool>]
              ["R" error]
@@ -12,7 +12,7 @@
              (collection [list "list/" Monad<List>]
                          [set]))
        ["r" math/random "r/" Monad<Random>]
-       [macro #+ Monad<Meta>]
+       [macro (#+ Monad<Meta>)]
        (macro [code])
        (language [type "type/" Equivalence<Type>]
                  (type ["tc" check])
diff --git a/stdlib/test/test/lux/language/compiler/analysis/function.lux b/stdlib/test/test/lux/language/compiler/analysis/function.lux
index e751f5e27..a1b4dafe9 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/function.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (data ["e" error]
              [maybe]
@@ -16,7 +16,7 @@
        (language [type "type/" Equivalence<Type>]
                  [".L" reference]
                  (compiler [".L" init]
-                           [".L" analysis #+ Analysis]
+                           [".L" analysis (#+ Analysis)]
                            (analysis [".A" type]
                                      [".A" expression]
                                      ["/" function])))
diff --git a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
index 5e19dd4e8..5a6e6cc69 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
@@ -1,9 +1,9 @@
 (.module:
-  [lux #- primitive]
+  [lux (#- primitive)]
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe
-                ["ex" exception #+ exception:])
+                ["ex" exception (#+ exception:)])
        (data (text format)
              ["e" error])
        ["r" math/random "r/" Monad<Random>]
@@ -12,7 +12,7 @@
        [language]
        (language [".L" type "type/" Equivalence<Type>]
                  (compiler [".L" init]
-                           [analysis #+ Analysis]
+                           [analysis (#+ Analysis)]
                            (analysis [".A" type]
                                      [".A" expression])))
        test))
diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
index 743c4194c..656e0bdd6 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (concurrency [atom])
        (data text/format
@@ -9,7 +9,7 @@
              [product]
              (collection [array]))
        ["r" math/random "r/" Monad<Random>]
-       [macro #+ Monad<Meta>]
+       [macro (#+ Monad<Meta>)]
        (macro [code])
        [language]
        (language [type "type/" Equivalence<Type>]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
index bbe4c0170..72a1f0337 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (concurrency [atom])
        (data ["e" error]
@@ -13,7 +13,7 @@
                          [list "list/" Fold<List>]
                          ["dict" dictionary]))
        ["r" math/random "r/" Monad<Random>]
-       [macro #+ Monad<Meta>]
+       [macro (#+ Monad<Meta>)]
        (macro [code])
        [language]
        (language [type]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/reference.lux b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
index 7016c3181..f91edb1ba 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/reference.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
@@ -1,13 +1,13 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (data ["e" error]
              [ident "ident/" Equivalence<Ident>]
              [text "text/" Equivalence<Text>])
        ["r" math/random]
-       [macro #+ Monad<Meta>]
+       [macro (#+ Monad<Meta>)]
        (macro [code])
        [language]
        (language [type "type/" Equivalence<Type>]
diff --git a/stdlib/test/test/lux/language/compiler/analysis/structure.lux b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
index 177e84e52..95c19331b 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (data [bool "bool/" Equivalence<Bool>]
              ["e" error]
@@ -19,7 +19,7 @@
                  (type ["tc" check])
                  [".L" module]
                  (compiler [".L" init]
-                           [".L" analysis #+ Analysis Variant Tag]
+                           [".L" analysis (#+ Analysis Variant Tag)]
                            (analysis [".A" type]
                                      ["/" structure]
                                      [".A" expression])))
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/case.lux b/stdlib/test/test/lux/language/compiler/synthesis/case.lux
index 92051fcb4..b6d554604 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/case.lux
@@ -1,12 +1,12 @@
 (.module:
   lux
-  (lux (control [monad #+ do]
+  (lux (control [monad (#+ do)]
                 pipe)
        (data [error "error/" Functor<Error>])
        (language ["///." reference]
                  ["///." compiler]
-                 [".L" analysis #+ Branch Analysis]
-                 ["//" synthesis #+ Synthesis]
+                 [".L" analysis (#+ Branch Analysis)]
+                 ["//" synthesis (#+ Synthesis)]
                  (synthesis [".S" expression])
                  [".L" extension])
        ["r" math/random "r/" Monad<Random>]
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/function.lux b/stdlib/test/test/lux/language/compiler/synthesis/function.lux
index bd6c4c7a9..244692994 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/function.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (data [product]
              [maybe]
@@ -9,12 +9,12 @@
              [number]
              text/format
              (collection [list "list/" Functor<List> Fold<List>]
-                         ["dict" dictionary #+ Dictionary]
+                         ["dict" dictionary (#+ Dictionary)]
                          [set]))
-       (language ["///." reference #+ Variable "variable/" Equivalence<Variable>]
+       (language ["///." reference (#+ Variable) "variable/" Equivalence<Variable>]
                  ["///." compiler]
-                 [".L" analysis #+ Arity Analysis]
-                 ["//" synthesis #+ Synthesis]
+                 [".L" analysis (#+ Arity Analysis)]
+                 ["//" synthesis (#+ Synthesis)]
                  (synthesis [".S" expression])
                  [".L" extension])
        ["r" math/random]
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux b/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
index 04e8b4dec..e90d8cb26 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/primitive.lux
@@ -1,15 +1,15 @@
 (.module:
-  [lux #- primitive]
+  [lux (#- primitive)]
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (data [error]
              text/format)
        [language]
        (language [".L" extension]
                  ["///." compiler]
-                 [".L" analysis #+ Analysis]
-                 ["//" synthesis #+ Synthesis]
+                 [".L" analysis (#+ Analysis)]
+                 ["//" synthesis (#+ Synthesis)]
                  (synthesis [".S" expression]))
        ["r" math/random]
        test))
diff --git a/stdlib/test/test/lux/language/compiler/synthesis/structure.lux b/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
index e3351158e..125efdc49 100644
--- a/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/synthesis/structure.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 pipe)
        (data [bool "bool/" Equivalence<Bool>]
              [product]
@@ -9,7 +9,7 @@
              (collection [list]))
        (language ["///." compiler]
                  [".L" analysis]
-                 ["//" synthesis #+ Synthesis]
+                 ["//" synthesis (#+ Synthesis)]
                  (synthesis [".S" expression])
                  [".L" extension])
        ["r" math/random "r/" Monad<Random>]
diff --git a/stdlib/test/test/lux/language/syntax.lux b/stdlib/test/test/lux/language/syntax.lux
index 9df62a608..02bfee533 100644
--- a/stdlib/test/test/lux/language/syntax.lux
+++ b/stdlib/test/test/lux/language/syntax.lux
@@ -1,14 +1,14 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do])
+       (control [monad (#+ do)])
        (data [number]
              ["e" error]
              [text]
              (text format
                    ["l" lexer])
              (collection [list]
-                         ["dict" dictionary #+ Dictionary]))
+                         ["dict" dictionary (#+ Dictionary)]))
        ["r" math/random "r/" Monad<Random>]
        (macro [code])
        (language ["&" syntax])
diff --git a/stdlib/test/test/lux/language/type.lux b/stdlib/test/test/lux/language/type.lux
index ee53dd542..7e4689a58 100644
--- a/stdlib/test/test/lux/language/type.lux
+++ b/stdlib/test/test/lux/language/type.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control ["M" monad #+ do Monad]
+       (control ["M" monad (#+ do Monad)]
                 pipe)
        (data [text "Text/" Monoid<Text>]
              text/format
diff --git a/stdlib/test/test/lux/language/type/check.lux b/stdlib/test/test/lux/language/type/check.lux
index 7b24d0f91..f1f464bf8 100644
--- a/stdlib/test/test/lux/language/type/check.lux
+++ b/stdlib/test/test/lux/language/type/check.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
-                [pipe #+ case>])
+       (control [monad (#+ do Monad)]
+                [pipe (#+ case>)])
        (data [product]
              [maybe]
              [number]
diff --git a/stdlib/test/test/lux/macro/code.lux b/stdlib/test/test/lux/macro/code.lux
index 300adc53c..bc172def2 100644
--- a/stdlib/test/test/lux/macro/code.lux
+++ b/stdlib/test/test/lux/macro/code.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data [text "T/" Equivalence<Text>]
              text/format
              [number])
diff --git a/stdlib/test/test/lux/macro/poly/equivalence.lux b/stdlib/test/test/lux/macro/poly/equivalence.lux
index fc86cb597..a498478fd 100644
--- a/stdlib/test/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/test/test/lux/macro/poly/equivalence.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
-                [equivalence #+ Equivalence])
+       (control [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)])
        (data text/format
              [bool]
              [number "int/" Number<Int>]
@@ -11,7 +11,7 @@
              (collection [list]))
        ["r" math/random]
        [macro]
-       (macro [poly #+ derived:]
+       (macro [poly (#+ derived:)]
               ["&" poly/equivalence]))
   lux/test)
 
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index 9db2ea282..0b92743e2 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -2,7 +2,7 @@
   lux
   (lux (control [state])
        (data [identity])
-       (macro [poly #+ derived:]
+       (macro [poly (#+ derived:)]
               ["&" poly/functor]))
   lux/test)
 
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index 3b9815064..258610aff 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
-                [equivalence #+ Equivalence]
+       (control [monad (#+ do Monad)]
+                [equivalence (#+ Equivalence)]
                 ["p" parser])
        (data [text "Text/" Monoid<Text>]
              text/format
@@ -13,7 +13,7 @@
        ["r" math/random]
        [macro]
        (macro [code]
-              ["s" syntax #+ syntax: Syntax]))
+              ["s" syntax (#+ syntax: Syntax)]))
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux
index 4e7e29a1e..8fee2b105 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/test/test/lux/math.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data [bool "bool/" Equivalence<Bool>]
              [number "frac/" Number<Frac>])
        ["r" math/random]
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux
index f5eb9d1c7..8962fc0a2 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/test/test/lux/math/logic/continuous.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
-  (lux [io]
-       (control [monad #+ do Monad])
+  (lux (control [monad (#+ do)])
+       [io]
        ["r" math/random]
        ["&" math/logic/continuous])
   lux/test)
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index a73df0c37..ed41fde5d 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data (collection [list]
                          [set])
              [bool "B/" Equivalence<Bool>]
diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/test/test/lux/math/modular.lux
index dc0d89c40..b6778e2a0 100644
--- a/stdlib/test/test/lux/math/modular.lux
+++ b/stdlib/test/test/lux/math/modular.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux (control [monad #+ do])
+  (lux (control [monad (#+ do)])
        (data [product]
              [bool "bool/" Equivalence<Bool>]
              ["e" error]
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux
index a7e2f583d..aa574511b 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/test/test/lux/math/random.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data [number]
              text/format
              (collection [list]
diff --git a/stdlib/test/test/lux/time/date.lux b/stdlib/test/test/lux/time/date.lux
index dbd925fda..798bda645 100644
--- a/stdlib/test/test/lux/time/date.lux
+++ b/stdlib/test/test/lux/time/date.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 [pipe])
        (data ["E" error])
        (math ["r" random "r/" Monad<Random>])
diff --git a/stdlib/test/test/lux/time/duration.lux b/stdlib/test/test/lux/time/duration.lux
index 6437a45a3..a15738906 100644
--- a/stdlib/test/test/lux/time/duration.lux
+++ b/stdlib/test/test/lux/time/duration.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad])
+       (control [monad (#+ do Monad)])
        (data ["E" error])
        (math ["r" random])
        (time ["@" duration]))
diff --git a/stdlib/test/test/lux/time/instant.lux b/stdlib/test/test/lux/time/instant.lux
index cff332527..e5bc7a7ea 100644
--- a/stdlib/test/test/lux/time/instant.lux
+++ b/stdlib/test/test/lux/time/instant.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do Monad]
+       (control [monad (#+ do Monad)]
                 pipe)
        (data [text]
              text/format
diff --git a/stdlib/test/test/lux/type/implicit.lux b/stdlib/test/test/lux/type/implicit.lux
index 001185a2e..94dcdad1e 100644
--- a/stdlib/test/test/lux/type/implicit.lux
+++ b/stdlib/test/test/lux/type/implicit.lux
@@ -3,7 +3,7 @@
   (lux [io]
        (control [equivalence]
                 [functor]
-                [monad #+ do Monad])
+                [monad (#+ do Monad)])
        (data [number]
              [bool "bool/" Equivalence<Bool>]
              (collection [list]))
diff --git a/stdlib/test/test/lux/type/resource.lux b/stdlib/test/test/lux/type/resource.lux
index c92af92e8..9024975e2 100644
--- a/stdlib/test/test/lux/type/resource.lux
+++ b/stdlib/test/test/lux/type/resource.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
-  (lux (control (monad [indexed #+ do]))
+  (lux (control (monad [indexed (#+ do)]))
        [macro]
-       (type [resource #+ Res])
+       (type [resource (#+ Res)])
        [io])
   lux/test)
 
diff --git a/stdlib/test/test/lux/world/blob.lux b/stdlib/test/test/lux/world/blob.lux
index c0704d851..2adc116c3 100644
--- a/stdlib/test/test/lux/world/blob.lux
+++ b/stdlib/test/test/lux/world/blob.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
+       (control [monad (#+ do)]
                 [pipe])
        (data [bit]
              [number]
diff --git a/stdlib/test/test/lux/world/file.lux b/stdlib/test/test/lux/world/file.lux
index e126b8703..bd6ff9294 100644
--- a/stdlib/test/test/lux/world/file.lux
+++ b/stdlib/test/test/lux/world/file.lux
@@ -1,7 +1,7 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do])
+       (control [monad (#+ do)])
        (concurrency [promise])
        (data [error]
              [text]
diff --git a/stdlib/test/test/lux/world/net/tcp.lux b/stdlib/test/test/lux/world/net/tcp.lux
index e49a06a1e..7b232b7c6 100644
--- a/stdlib/test/test/lux/world/net/tcp.lux
+++ b/stdlib/test/test/lux/world/net/tcp.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
-                ["ex" exception #+ exception:])
+       (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (concurrency ["P" promise]
                     ["T" task]
                     [frp "frp/" Functor<Channel>])
diff --git a/stdlib/test/test/lux/world/net/udp.lux b/stdlib/test/test/lux/world/net/udp.lux
index 6a51e0bf4..53c2f9d88 100644
--- a/stdlib/test/test/lux/world/net/udp.lux
+++ b/stdlib/test/test/lux/world/net/udp.lux
@@ -1,8 +1,8 @@
 (.module:
   lux
   (lux [io]
-       (control [monad #+ do]
-                ["ex" exception #+ exception:])
+       (control [monad (#+ do)]
+                ["ex" exception (#+ exception:)])
        (concurrency ["P" promise]
                     ["T" task]
                     [frp])
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index ce4113317..8d644b68e 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -1,6 +1,6 @@
 (.module:
   lux
-  (lux [cli #+ program:]
+  (lux [cli (#+ program:)]
        [test])
   (test ["_." lux]
         (lux ["_." cli]
@@ -35,7 +35,7 @@
                    ["_." maybe]
                    ["_." product]
                    ["_." sum]
-                   ["_." number]
+                   ## ["_." number] ## Specially troublesome...
                    (number ["_." ratio]
                            ["_." complex])
                    ["_." text]
@@ -44,40 +44,53 @@
                          ["_." regex])
                    (format ["_." json]
                            ["_." xml])
-                   (coll ["_." array]
-                         ["_." bits]
-                         ["_." list]
-                         ["_." stack]
-                         ["_." sequence]
-                         ["_." stream]
-                         ["_." dictionary/unordered]
-                         ["_." dictionary/ordered]
-                         ["_." set/unordered]
-                         ["_." set/ordered]
-                         ["_." queue]
-                         (queue ["_." priority])
-                         (tree ["_." rose]
-                               (rose ["_." zipper]))))
+                   (collection ["_." array]
+                               ["_." bits]
+                               ["_." list]
+                               ["_." stack]
+                               ["_." row]
+                               ["_." sequence]
+                               ["_." dictionary]
+                               (dictionary ["_.D" ordered])
+                               ["_." set]
+                               (set ["_.S" ordered])
+                               ["_." queue]
+                               (queue ["_." priority])
+                               (tree ["_." rose]
+                                     (rose ["_." zipper]))))
              ["_." math]
              (math ["_." random]
                    ["_." modular]
-                   ["_." constructive]
                    (logic ["_." continuous]
                           ["_." fuzzy]))
              (macro ["_." code]
                     ["_." syntax]
-                    (poly ["poly_." equality]
+                    (poly ["poly_." equivalence]
                           ["poly_." functor]))
-             (type ["_." implicit]
+             (type ## ["_." implicit] ## Specially troublesome...
                    ["_." resource]
-                   (object
-                     ["_." interface]
-                     ["_." protocol]))
-             (lang ["_lang/." syntax]
-                   ["_." type]
-                   (type ["_." check]))
+              (object
+                ["_." interface]
+                ["_." protocol]))
+             (language ["_language/." syntax]
+                       ["_." type]
+                       (type ["_." check])
+                       (compiler (analysis ["_.A" primitive]
+                                           ["_.A" structure]
+                                           ["_.A" reference]
+                                           ["_.A" case]
+                                           ["_.A" function]
+                                           ## (procedure ["_.A" common]
+                                           ##            ["_.A" host])
+                                           )
+                                 ## (synthesis ["_.S" primitive]
+                                 ##            ["_.S" structure]
+                                 ##            ["_.S" case]
+                                 ##            ["_.S" function])
+                                 )
+                       )
              (world ["_." blob]
-                    ["_." file]
+                    ## ["_." file] ## Specially troublesome...
                     (net ["_." tcp]
                          ["_." udp]))
              ))
@@ -91,15 +104,37 @@
              [tainted]
              (format [context]
                      [html]
-                     [css])
-             (coll (tree ["_." rose/parser])))
+                     [css]
+                     [binary])
+             (collection (tree ["_." rose/parser])
+                         (dictionary [plist])
+                         (set [multi]))
+             (text [buffer]))
        [macro]
        (macro (poly [json]))
        (type [unit]
              [refinement]
              [quotient])
-       [world/env]
-       [world/console])
+       (world [environment]
+              [console])
+       (language (host [".H" scheme])
+                 (compiler [translation]
+                           (translation (scheme ["._scheme" primitive]
+                                                ["._scheme" structure]
+                                                ["._scheme" reference]
+                                                ["._scheme" function]
+                                                ["._scheme" loop]
+                                                ["._scheme" case]
+                                                ["._scheme" extension]
+                                                ["._scheme" extension/common]
+                                                ["._scheme" expression]))
+                           (default (repl [type]))
+                           (meta [io]
+                                 [io/context]
+                                 [io/archive]
+                                 [archive]
+                                 ["._meta" cache])
+                           (default ["._default" cache]))))
   )
 
 (program: args