De-taggification | part 2

47 files changed, 342 insertions, 342 deletions

diff --git a/stdlib/source/test/aedifex.lux b/stdlib/source/test/aedifex.lux
index dc04f13de..1860eeab7 100644
--- a/stdlib/source/test/aedifex.lux
+++ b/stdlib/source/test/aedifex.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux #*
-    [program (#+ program:)]
-    ["_" test (#+ Test)]
+   [lux "*"
+    [program {"+" [program:]}]
+    ["_" test {"+" [Test]}]
     [control
      ["." io]]]]
-  ["." / #_
+  ["." / "_"
    ["#." artifact]
    ["#." cli]
    ["#." command]
diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux
index da1941245..d1ecac072 100644
--- a/stdlib/source/test/aedifex/artifact.lux
+++ b/stdlib/source/test/aedifex/artifact.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
-     [hash (#+ Hash)]
+     [monad {"+" [do]}]
+     [hash {"+" [Hash]}]
      [\\specification
       ["$." equivalence]
       ["$." order]
@@ -12,12 +12,12 @@
     [data
      ["." text ("#\." equivalence)]]
     [math
-     ["." random (#+ Random)]]
+     ["." random {"+" [Random]}]]
     [world
      ["." file]
      [net
       ["." uri]]]]]
-  ["." / #_
+  ["." / "_"
    ["#." extension]
    ["#." snapshot]
    ["#." time]
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index 93355ea60..4a99544db 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [data
      ["." text ("#\." equivalence)]
      [collection
       ["." set]
       ["." list]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#" type]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index 40fc5e137..e04b49e71 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -11,8 +11,8 @@
      [parser
       ["<.>" xml]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]]]]
-  ["$." / #_
+     ["." random {"+" [Random]} ("#\." monad)]]]]
+  ["$." / "_"
    ["#." build]
    ["#." stamp]
    ["#." time]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index ab169fe29..e3e0c62cd 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -11,7 +11,7 @@
      [parser
       ["<.>" xml]]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index e1903c937..82217bd62 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -11,12 +11,12 @@
      [parser
       ["<.>" xml]]]
     [math
-     ["." random (#+ Random)]]
+     ["." random {"+" [Random]}]]
     [time
      ["." instant]]]]
   [\\program
    ["." /]]
-  ["$." // #_
+  ["$." // "_"
    ["#." time]
    ["#." build]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index 22436060e..f11fe6f12 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -11,10 +11,10 @@
      [parser
       ["<.>" text]]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\program
    ["." /]]
-  ["$." /// #_
+  ["$." /// "_"
    ["#." time]])
 
 (def: .public random
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index f027e0e46..162b05348 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -11,12 +11,12 @@
      [parser
       ["<.>" xml]]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\program
    ["." /]]
-  ["." / #_
+  ["." / "_"
    ["#." value]]
-  ["$." /// #_
+  ["$." /// "_"
    ["#." type]
    ["#." time]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index 370ea21ab..e63453f84 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -12,15 +12,15 @@
       ["<.>" text]]]
     [data
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]
+     ["." random {"+" [Random]} ("#\." monad)]
      [number
       ["n" nat]
       ["i" int]]]
     [time
      ["." instant]]]]
-  ["$." /// #_
+  ["$." /// "_"
    ["#." stamp]]
   [\\program
    ["." /
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index c4f74df92..a7d3f1463 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -13,12 +13,12 @@
     [time
      ["." instant ("#\." equivalence)]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["i" int]]]]]
   [\\program
    ["." /]]
-  ["." / #_
+  ["." / "_"
    ["#." date]
    ["#." time]])
 
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index 15eb29aba..6762ed541 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -12,7 +12,7 @@
      [parser
       ["<.>" text]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]
       ["i" int]]]
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index 7e8317b78..d156d5f03 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     ["." time]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try ("#\." functor)]
      [parser
       ["<.>" text]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]
       ["i" int]]]]]
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index be1fdfc80..e0d537c1b 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [data
      ["." text]
      [collection
       ["." set]
       ["." list]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]
+     ["." random {"+" [Random]} ("#\." monad)]
      [number
       ["n" nat]]]]]
   [\\program
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index 95019139f..a9ef8d07b 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -11,10 +11,10 @@
      [parser
       ["<.>" xml]]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\program
    ["." /]]
-  ["$." // #_
+  ["$." // "_"
    ["#." time]
    ["#." snapshot
     ["#/." version]]])
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 0390e441d..748af575a 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -1,25 +1,25 @@
 (.module:
   [library
-   [lux (#- Type type)
-    ["_" test (#+ Test)]
+   [lux {"-" [Type type]}
+    ["_" test {"+" [Test]}]
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
      ["." try]
      [concurrency
-      ["." async (#+ Async)]]
+      ["." async {"+" [Async]}]]
      [parser
       ["." environment]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." text]
      [format
-      [xml (#+ XML)]]
+      [xml {"+" [XML]}]]
      [collection
       ["." set]
       ["." dictionary]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]
+     ["." random {"+" [Random]} ("#\." monad)]
      [number
       ["n" nat]]]
     [world
@@ -34,15 +34,15 @@
       ["_." binary]]]]]
   [\\program
    ["." /
-    ["/#" // #_
-     ["#" profile (#+ Profile)]
-     ["#." package (#+ Package)]
+    ["/#" // "_"
+     ["#" profile {"+" [Profile]}]
+     ["#." package {"+" [Package]}]
      ["#." pom]
-     ["#." dependency (#+ Dependency)
-      ["#/." resolution (#+ Resolution)]]
-     ["#." artifact (#+ Artifact)
-      ["#/." type (#+ Type)]]
-     ["#." repository #_
+     ["#." dependency {"+" [Dependency]}
+      ["#/." resolution {"+" [Resolution]}]]
+     ["#." artifact {"+" [Artifact]}
+      ["#/." type {"+" [Type]}]]
+     ["#." repository "_"
       ["#/." origin]]]]])
 
 (def: type
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux
index 9712d8a93..8a51928af 100644
--- a/stdlib/source/test/aedifex/cli.lux
+++ b/stdlib/source/test/aedifex/cli.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
-     [pipe (#+ case>)]
+     [pipe {"+" [case>]}]
      ["." try]
      [parser
       ["." cli]]]
@@ -16,10 +16,10 @@
      [collection
       ["." list]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]]]]
+     ["." random {"+" [Random]} ("#\." monad)]]]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#" profile]]]])
 
 (def: compilation
diff --git a/stdlib/source/test/aedifex/command.lux b/stdlib/source/test/aedifex/command.lux
index 8fbca7e56..704376f9c 100644
--- a/stdlib/source/test/aedifex/command.lux
+++ b/stdlib/source/test/aedifex/command.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]]]
-  ["." / #_
+   [lux "*"
+    ["_" test {"+" [Test]}]]]
+  ["." / "_"
    ["#." version]
    ["#." pom]
 
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index 91506ca06..894e647be 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     [pipe (#+ case>)]
+     [pipe {"+" [case>]}]
      ["." try]
      [parser
       ["." environment]]
      [concurrency
-      ["." atom (#+ Atom)]
-      ["." async (#+ Async)]]]
+      ["." atom {"+" [Atom]}]
+      ["." async {"+" [Async]}]]]
     [data
      ["." binary]
      ["." text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [collection
@@ -27,22 +27,22 @@
     [time
      ["." instant]]
     [world
-     [console (#+ Console)]
-     ["." shell (#+ Exit Shell)]
-     ["." program (#+ Program)]
+     [console {"+" [Console]}]
+     ["." shell {"+" [Exit Shell]}]
+     ["." program {"+" [Program]}]
      ["." file
       ["." watch]]]]]
-  ["." // #_
+  ["." // "_"
    ["$." version]
    ["$." build]]
   [\\program
    ["." /
-    ["//#" /// #_
-     [command (#+ Command)]
-     ["#" profile (#+ Profile)]
+    ["//#" /// "_"
+     [command {"+" [Command]}]
+     ["#" profile {"+" [Profile]}]
      ["#." action]
      [dependency
-      [resolution (#+ Resolution)]]]]])
+      [resolution {"+" [Resolution]}]]]]])
 
 (def: (command expected_runs end_signal fs dummy_file)
   (-> Nat Text (file.System Async) file.Path
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index 95363b079..3009e5011 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     [pipe (#+ case>)]
-     [io (#+ IO)]
+     [pipe {"+" [case>]}]
+     [io {"+" [IO]}]
      ["." try]
      ["." exception]
      [concurrency
-      ["." async (#+ Async)]]
+      ["." async {"+" [Async]}]]
      [parser
       ["." environment]]]
     [data
@@ -18,24 +18,24 @@
      [collection
       ["." dictionary]]]
     [math
-     ["." random (#+ Random)]]
+     ["." random {"+" [Random]}]]
     [world
      ["." file]
-     ["." shell (#+ Shell)]
+     ["." shell {"+" [Shell]}]
      ["." program]]]]
-  ["." // #_
+  ["." // "_"
    ["@." version]
-   ["$/#" // #_
+   ["$/#" // "_"
     ["#." package]]]
   [\\program
    ["." /
-    ["//#" /// #_
-     ["#" profile (#+ Profile)]
+    ["//#" /// "_"
+     ["#" profile {"+" [Profile]}]
      ["#." action]
      ["#." artifact
       ["#/." type]]
-     ["#." dependency (#+ Dependency)
-      ["#/." resolution (#+ Resolution)]]]]])
+     ["#." dependency {"+" [Dependency]}
+      ["#/." resolution {"+" [Resolution]}]]]]])
 
 (def: .public good_shell
   (-> Any (Shell IO))
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index 59908a364..7d7e613fe 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -1,27 +1,27 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." product]
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor)]
       ["." set]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]
     [world
-     ["." file (#+ Path)]]]]
+     ["." file {"+" [Path]}]]]]
   [//
    ["@." version]
    [//
@@ -32,9 +32,9 @@
        ["$." binary]]]]]]
   [\\program
    ["." /
-    ["//#" /// #_
+    ["//#" /// "_"
      ["#" profile]
-     ["#." action (#+ Action)]]]])
+     ["#." action {"+" [Action]}]]]])
 
 (def: node_name
   (Random Text)
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index b36998b6f..77af48126 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." maybe]
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]
+      ["." async {"+" [Async]}]]
      [parser
       ["." environment]]]
     [data
      ["." binary ("#\." equivalence)]
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
-     ["." format #_
+     ["." format "_"
       ["#" binary]
       ["." tar]
       ["." xml]]
@@ -27,7 +27,7 @@
      ["." random]]
     [world
      ["." file]
-     ["." program (#+ Program)]]]]
+     ["." program {"+" [Program]}]]]]
   [program
    [compositor
     ["." export]]]
@@ -39,14 +39,14 @@
     ["$." repository]]]
   [\\program
    ["." /
-    ["//#" /// #_
+    ["//#" /// "_"
      ["#" profile]
      ["#." action]
      ["#." pom]
      ["#." hash]
-     ["#." repository (#+ Repository)
+     ["#." repository {"+" [Repository]}
       ["#/." remote]]
-     ["#." artifact (#+ Artifact)
+     ["#." artifact {"+" [Artifact]}
       ["#/." extension]]]]])
 
 (def: (execute! program repository fs artifact profile)
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index 95f757f7d..3047ccb2b 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      ["." predicate]]
     [control
      ["." try]
@@ -13,7 +13,7 @@
       ["." environment]]]
     [data
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [collection
@@ -22,22 +22,22 @@
      [format
       ["." xml]]]
     [math
-     ["." random (#+ Random)]]
+     ["." random {"+" [Random]}]]
     [world
      ["." program]
      ["." file]]]]
-  ["." // #_
+  ["." // "_"
    ["@." version]
-   ["$/#" // #_
+   ["$/#" // "_"
     ["#." package]
     ["#." artifact]
-    ["#." dependency #_
+    ["#." dependency "_"
      ["#/." resolution]]]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#." clean]
-     ["/#" // #_
+     ["/#" // "_"
       ["#" profile]
       ["#." action]
       ["#." pom]
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index 93d304d36..76f8cf768 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -1,27 +1,27 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
-     ["." try (#+ Try) ("#\." functor)]
+     ["." try {"+" [Try]} ("#\." functor)]
      ["." exception]
      [concurrency
-      ["." async (#+ Async)]]
+      ["." async {"+" [Async]}]]
      [parser
       ["." environment]]]
     [data
      ["." binary]
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." set (#+ Set)]]]
+      ["." set {"+" [Set]}]]]
     [math
      ["." random]]
     [world
      ["." file]
-     ["." program (#+ Program)]]]]
+     ["." program {"+" [Program]}]]]]
   [//
    ["$." version]
    [//
@@ -29,14 +29,14 @@
     ["$." artifact]]]
   [\\program
    ["." /
-    ["/#" // #_
-     ["/#" // #_
+    ["/#" // "_"
+     ["/#" // "_"
       ["#" profile]
-      ["#." action (#+ Action)]
+      ["#." action {"+" [Action]}]
       ["#." local]
       ["#." artifact
        ["#/." extension]]
-      ["#." repository #_
+      ["#." repository "_"
        ["#/." local]]]]]])
 
 (def: .public (make_sources! fs sources)
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 211ce1ad5..1bac5cf69 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try ("#\." functor)]
      [concurrency
@@ -25,7 +25,7 @@
     ["@." profile]]]
   [\\program
    ["." /
-    ["//#" /// #_
+    ["//#" /// "_"
      ["#" profile]
      ["#." action]
      ["#." pom]]]])
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index 3e3cf85d7..0496428a6 100644
--- a/stdlib/source/test/aedifex/command/test.lux
+++ b/stdlib/source/test/aedifex/command/test.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try]
      ["." exception]
@@ -22,17 +22,17 @@
      ["." file]
      ["." shell]
      ["." program]]]]
-  ["." // #_
+  ["." // "_"
    ["@." version]
    ["@." build]
-   ["$/#" // #_
+   ["$/#" // "_"
     ["#." package]]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#." build]
-     ["/#" // #_
-      ["#" profile (#+ Profile)]
+     ["/#" // "_"
+      ["#" profile {"+" [Profile]}]
       ["#." action]
       ["#." artifact
        ["#/." type]]
diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux
index c1ab3814e..74223d02f 100644
--- a/stdlib/source/test/aedifex/command/version.lux
+++ b/stdlib/source/test/aedifex/command/version.lux
@@ -1,28 +1,28 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." maybe]
      ["." try]
-     ["." exception (#+ exception:)]
+     ["." exception {"+" [exception:]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [math
      ["." random]]
     [tool
      [compiler
       ["." version]
-      ["." language #_
-       ["#/." lux #_
+      ["." language "_"
+       ["#/." lux "_"
         ["#" version]]]]]
     [world
-     ["." console (#+ Console Mock)]]]]
+     ["." console {"+" [Console Mock]}]]]]
   [///
    ["@." profile]]
   [\\program
diff --git a/stdlib/source/test/aedifex/dependency.lux b/stdlib/source/test/aedifex/dependency.lux
index 86d951f99..0f3eb7db0 100644
--- a/stdlib/source/test/aedifex/dependency.lux
+++ b/stdlib/source/test/aedifex/dependency.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]
       ["$." order]
       ["$." hash]]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [//
    ["@." artifact]]
   [\\program
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index f87aca761..e9bcc67a4 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -1,49 +1,49 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
-     ["." hash (#+ Hash)]]
+     [monad {"+" [do]}]
+     ["." hash {"+" [Hash]}]]
     [control
-     ["." io (#+ IO)]
+     ["." io {"+" [IO]}]
      ["." maybe ("#\." functor)]
      ["." try ("#\." functor)]
      [concurrency
-      ["." atom (#+ Atom)]
+      ["." atom {"+" [Atom]}]
       ["." async]]]
     [data
      ["." product]
-     ["." binary (#+ Binary) ("#\." equivalence)]
+     ["." binary {"+" [Binary]} ("#\." equivalence)]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." set]
       ["." list ("#\." mix)]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]
     [world
-     [net (#+ URL)
-      ["." uri (#+ URI)]
-      ["." http #_
+     [net {"+" [URL]}
+      ["." uri {"+" [URI]}]
+      ["." http "_"
        ["#" client]
        ["#/." status]
        ["@#" /]]]]]]
   ["$." //
-   ["#/" // #_
+   ["#/" // "_"
     ["#." package]]]
   [\\program
    ["." /
-    [// (#+ Dependency)
+    [// {"+" [Dependency]}
      ["." resolution]
      [//
       ["." profile]
       ["." metadata]
-      ["." package (#+ Package)]
-      ["." artifact (#+ Artifact) ("#\." equivalence)
+      ["." package {"+" [Package]}]
+      ["." artifact {"+" [Artifact]} ("#\." equivalence)
        ["#/." type]
        ["#/." extension]]
       ["." repository
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index 9f1826f9c..79e0bde5b 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      ["." predicate]
      [\\specification
       ["$." equivalence]]]
@@ -13,10 +13,10 @@
      [concurrency
       ["." async]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." product]
      ["." text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [format
@@ -26,8 +26,8 @@
       ["." set]
       ["." list]]]
     [math
-     ["." random (#+ Random)]]]]
-  ["$." /// #_
+     ["." random {"+" [Random]}]]]]
+  ["$." /// "_"
    ["#." package]
    ["#." repository]
    ["#." artifact]
@@ -35,17 +35,17 @@
     ["#." version]]]
   [\\program
    ["." /
-    ["//#" /// #_
+    ["//#" /// "_"
      ["#" profile]
-     ["#." package (#+ Package)]
+     ["#." package {"+" [Package]}]
      ["#." hash]
-     ["#." dependency (#+ Dependency) ("#\." equivalence)
+     ["#." dependency {"+" [Dependency]} ("#\." equivalence)
       ["#/." status]]
      ["#." pom]
-     ["#." artifact (#+ Artifact)
+     ["#." artifact {"+" [Artifact]}
       ["#/." type]
       ["#/." extension]]
-     ["#." repository (#+ Mock)
+     ["#." repository {"+" [Mock]}
       ["#/." origin]]]]])
 
 (def: random
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index aad21027d..65bd7161e 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [data
-     ["." binary #_
+     ["." binary "_"
       ["#T" \\test]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]]]]
-  ["$." /// #_
+     ["." random {"+" [Random]} ("#\." monad)]]]]
+  ["$." /// "_"
    ["#." hash]]
   [\\program
    ["." /
-    ["//#" /// #_
+    ["//#" /// "_"
      ["#." hash]]]])
 
 (def: .public random
diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux
index 46eab9c88..45e693c07 100644
--- a/stdlib/source/test/aedifex/hash.lux
+++ b/stdlib/source/test/aedifex/hash.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]
       ["$." codec]]]
@@ -11,11 +11,11 @@
      ["." try]
      ["." exception]]
     [data
-     ["." binary (#+ Binary)]
+     ["." binary {"+" [Binary]}]
      [text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]]]
   [\\program
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index 905075adc..39dec3ced 100644
--- a/stdlib/source/test/aedifex/input.lux
+++ b/stdlib/source/test/aedifex/input.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      [text
       ["%" format]
       [encoding
        ["." utf8]]]
      [collection
-      ["." set (#+ Set)]]]
+      ["." set {"+" [Set]}]]]
     [math
      ["." random]]
     [world
@@ -23,13 +23,13 @@
    ["$." profile]]
   [\\program
    ["." /
-    ["/#" // #_
-     ["#" profile (#+ Profile)]
+    ["/#" // "_"
+     ["#" profile {"+" [Profile]}]
      ["#." project]
      ["#." action]
      ["#." format]
      [repository
-      [remote (#+ Address)]]]]])
+      [remote {"+" [Address]}]]]]])
 
 (def: (with_default_source sources)
   (-> (Set //.Source) (Set //.Source))
diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux
index a8c0702bb..33c27fba7 100644
--- a/stdlib/source/test/aedifex/local.lux
+++ b/stdlib/source/test/aedifex/local.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [data
      ["." text]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [//
    ["@." artifact]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#." artifact]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/aedifex/metadata.lux b/stdlib/source/test/aedifex/metadata.lux
index a19f6dfa7..ad9460154 100644
--- a/stdlib/source/test/aedifex/metadata.lux
+++ b/stdlib/source/test/aedifex/metadata.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [data
      ["." text ("#\." equivalence)]]
     [math
      ["." random]]]]
-  ["." / #_
+  ["." / "_"
    ["#." artifact]
    ["#." snapshot]
    [//
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index e5e903e65..1d6aae530 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -21,7 +21,7 @@
     [macro
      ["." code]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]
     ["." time
@@ -36,9 +36,9 @@
   [\\program
    ["." /
     ["/#" //
-     ["/#" // #_
+     ["/#" // "_"
       ["#." artifact]
-      ["#." repository #_
+      ["#." repository "_"
        ["#/." local]]]]]])
 
 (def: .public random
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 5308c10ca..a8d518aac 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -21,32 +21,32 @@
     [macro
      ["." code]]
     [math
-     ["." random (#+ Random) ("#\." monad)]
+     ["." random {"+" [Random]} ("#\." monad)]
      [number
       ["n" nat]]]
     ["." time
      ["." date]
      ["." year]
      ["." month]
-     ["." instant (#+ Instant)]
+     ["." instant {"+" [Instant]}]
      ["." duration]]
     [world
      ["." file]
      ["." program]]]]
-  ["$." /// #_
+  ["$." /// "_"
    ["#." artifact
     ["#/." type]
     ["#/." time]
-    ["#/." snapshot #_
+    ["#/." snapshot "_"
      ["#/." version]]]]
   [\\program
    ["." /
     ["/#" //
-     ["/#" // #_
+     ["/#" // "_"
       [artifact
-       [versioning (#+ Versioning)]
+       [versioning {"+" [Versioning]}]
        ["#." snapshot]]
-      ["#." repository #_
+      ["#." repository "_"
        ["#/." local]]]]]])
 
 (def: random_instant
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 7b2ac3865..8bd1d6fde 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -14,11 +14,11 @@
       [encoding
        ["." utf8]]]
      [format
-      ["." xml (#+ XML)]]
+      ["." xml {"+" [XML]}]]
      [collection
-      ["." set (#+ Set)]]]
+      ["." set {"+" [Set]}]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]
     [world
@@ -31,7 +31,7 @@
       ["$." binary]]]]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#" profile]
      ["#." hash ("#\." equivalence)]
      ["#." pom]
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index be05cdda9..7d15e6dda 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
-     [hash (#+ Hash)]]
+     [monad {"+" [do]}]
+     [hash {"+" [Hash]}]]
     [control
-     [pipe (#+ case>)]
+     [pipe {"+" [case>]}]
      ["." try]
      [parser
       ["<.>" code]]]
     [data
      ["." text]
      [collection
-      ["." set (#+ Set)]
-      ["." dictionary (#+ Dictionary)]
+      ["." set {"+" [Set]}]
+      ["." dictionary {"+" [Dictionary]}]
       ["." list ("#\." functor)]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]
     [macro
@@ -26,11 +26,11 @@
    ["@." profile]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#" profile]
-     ["#." project (#+ Project)]
-     ["#." artifact (#+ Artifact)]
-     ["#." dependency (#+ Dependency)]
+     ["#." project {"+" [Project]}]
+     ["#." artifact {"+" [Artifact]}]
+     ["#." dependency {"+" [Dependency]}]
      ["#." format]]]])
 
 (def: name
diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux
index e413b69ed..f53bb2404 100644
--- a/stdlib/source/test/aedifex/pom.lux
+++ b/stdlib/source/test/aedifex/pom.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try]
      ["." exception]
@@ -19,7 +19,7 @@
    ["@." profile]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#" profile]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 39aaa4fa3..48f28903e 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -1,25 +1,25 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
-     [hash (#+ Hash)]
+     [monad {"+" [do]}]
+     [hash {"+" [Hash]}]
      [\\specification
       ["$." equivalence]
       ["$." monoid]]]
     [control
-     [pipe (#+ case>)]
+     [pipe {"+" [case>]}]
      ["." try]
      [parser
       ["." cli]]]
     [data
      ["." text ("#\." equivalence)]
      [collection
-      ["." set (#+ Set)]
-      ["." dictionary (#+ Dictionary)]]]
+      ["." set {"+" [Set]}]
+      ["." dictionary {"+" [Dictionary]}]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]
+     ["." random {"+" [Random]} ("#\." monad)]
      [number
       ["n" nat]]]]]
   [//
@@ -27,12 +27,12 @@
    ["@." dependency]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#." runtime]
-     ["#." dependency (#+ Dependency)]
+     ["#." dependency {"+" [Dependency]}]
      ["#." format]
      [repository
-      [remote (#+ Address)]]]]])
+      [remote {"+" [Address]}]]]]])
 
 (def: distribution
   (Random /.Distribution)
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index c11444355..2e7eab542 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]
       ["$." monoid]]]
@@ -14,14 +14,14 @@
      ["." product]
      ["." text ("#\." equivalence)]]
     [math
-     ["." random (#+ Random) ("#\." monad)]
+     ["." random {"+" [Random]} ("#\." monad)]
      [number
       ["n" nat]]]]]
   [//
    ["@." profile]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#" profile]]]])
 
 (def: profile
diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux
index 8e8b4c945..9412b5fd5 100644
--- a/stdlib/source/test/aedifex/repository.lux
+++ b/stdlib/source/test/aedifex/repository.lux
@@ -1,28 +1,28 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [hash (#+ Hash)]
-     ["." monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [hash {"+" [Hash]}]
+     ["." monad {"+" [do]}]]
     [control
      ["." io]
      ["." try]
-     ["." exception (#+ exception:)]]
+     ["." exception {"+" [exception:]}]]
     [data
      ["." product]
-     ["." binary (#+ Binary)]
+     ["." binary {"+" [Binary]}]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]]]
+      ["." dictionary {"+" [Dictionary]}]]]
     [math
-     ["." random (#+ Random)]]
+     ["." random {"+" [Random]}]]
     [world
      [net
-      ["." uri (#+ URI)]]]]]
-  ["." / #_
+      ["." uri {"+" [URI]}]]]]]
+  ["." / "_"
    ["#." identity]
    ["#." origin]
    ["#." local]
@@ -34,9 +34,9 @@
   [\\program
    ["." /
     ["." remote]
-    ["/#" // #_
-     ["#." artifact (#+ Version Artifact)
-      ["#/." extension (#+ Extension)]]]]])
+    ["/#" // "_"
+     ["#." artifact {"+" [Version Artifact]}
+      ["#/." extension {"+" [Extension]}]]]]])
 
 (def: artifact
   (-> Version Artifact)
diff --git a/stdlib/source/test/aedifex/repository/identity.lux b/stdlib/source/test/aedifex/repository/identity.lux
index 6158d2397..045136c43 100644
--- a/stdlib/source/test/aedifex/repository/identity.lux
+++ b/stdlib/source/test/aedifex/repository/identity.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
      [\\specification
       ["$." equivalence]]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux
index 34ae887d7..eb7b9777d 100644
--- a/stdlib/source/test/aedifex/repository/local.lux
+++ b/stdlib/source/test/aedifex/repository/local.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try ("#\." functor)]
      [parser
diff --git a/stdlib/source/test/aedifex/repository/origin.lux b/stdlib/source/test/aedifex/repository/origin.lux
index 80c2946bc..6567471a1 100644
--- a/stdlib/source/test/aedifex/repository/origin.lux
+++ b/stdlib/source/test/aedifex/repository/origin.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
      [\\specification
       ["$." equivalence]]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\program
    ["." /]])
 
diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux
index 3218f15cd..a38e68104 100644
--- a/stdlib/source/test/aedifex/repository/remote.lux
+++ b/stdlib/source/test/aedifex/repository/remote.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     ["." io (#+ IO)]
+     ["." io {"+" [IO]}]
      ["." maybe ("#\." functor)]
      ["." try ("#\." monad)]
      ["." exception]
@@ -13,22 +13,22 @@
     [data
      ["." binary ("#\." equivalence)]
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [collection
       ["." dictionary]]]
     [math
-     ["." random (#+ Random)]]
+     ["." random {"+" [Random]}]]
     [world
-     [net (#+ URL)
-      ["." http #_
+     [net {"+" [URL]}
+      ["." http "_"
        ["#" client]
        ["#/." status]
        ["@#" /]]]]]]
   [\\program
    ["." /
-    ["/#" // #_
+    ["/#" // "_"
      ["#." identity]]]])
 
 (def: (url_body url)
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index d4f116242..4653f7c11 100644
--- a/stdlib/source/test/aedifex/runtime.lux
+++ b/stdlib/source/test/aedifex/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       ["$." equivalence]]]
     [control
@@ -14,7 +14,7 @@
       ["." list ("#\." functor)]
       ["." set]]]
     [math
-     ["." random (#+ Random) ("#\." monad)]
+     ["." random {"+" [Random]} ("#\." monad)]
      [number
       ["n" nat]]]]]
   [\\program