Better syntax for parallel-hierarchy imports.

46 files changed, 178 insertions, 180 deletions

diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux
index 935d835bb..b1bb102c1 100644
--- a/stdlib/source/test/aedifex/artifact.lux
+++ b/stdlib/source/test/aedifex/artifact.lux
@@ -4,9 +4,8 @@
    [abstract
     [monad (#+ do)]
     [hash (#+ Hash)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     [concurrency
      [promise (#+ Promise)]]]
@@ -24,8 +23,8 @@
    ["#." time]
    ["#." type]
    ["#." versioning]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Artifact)
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index 5d2491d28..9ae382975 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -12,10 +12,10 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
-     ["#" type]]]})
+     ["#" type]]]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index d48c8f34e..4e968904d 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -17,8 +16,8 @@
    ["#." stamp]
    ["#." time]
    ["#." version]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Snapshot)
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index e3fdcab62..156be7af4 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" xml]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Build)
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index f2051d037..aa3dbcff1 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -14,8 +13,8 @@
     ["." random (#+ Random)]]
    [time
     ["." instant]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["$." // #_
    ["#." time]
    ["#." build]])
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index 3acb37232..f6861bf9c 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" text]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["$." /// #_
    ["#." time]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 59ed7189f..06adc7239 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" xml]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["." / #_
    ["#." value]]
   ["$." /// #_
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index dc3f754a2..3ed0b32ce 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -22,11 +21,11 @@
     ["." instant]]]
   ["$." /// #_
    ["#." stamp]]
-  {#program
+  [\\program
    ["." /
     ["//#" ///
      ["#." stamp]
-     ["#." time]]]})
+     ["#." time]]]])
 
 (def: #export random
   (Random /.Value)
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index b9b0ab4e0..c2ab6a354 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -14,8 +13,8 @@
     ["." random (#+ Random)]
     [number
      ["i" int]]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["." / #_
    ["#." date]
    ["#." time]])
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index a68a60a56..494aa5e07 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -15,8 +15,8 @@
    [time
     ["." date]
     ["." year]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Date)
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index cd70d1c83..a17f9c40c 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -13,8 +13,8 @@
     [number
      ["n" nat]
      ["i" int]]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Time)
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index 01b581eb3..447b60bac 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -12,8 +12,8 @@
     ["." random (#+ Random) ("#\." monad)]
     [number
      ["n" nat]]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Type)
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index c438caca5..d1d4da7ef 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -3,17 +3,16 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
      ["<.>" xml]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   ["$." // #_
    ["#." time]
    ["#." snapshot
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 22a32e43f..d61a88057 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -31,7 +31,7 @@
     [lux
      [data
       ["_." binary]]]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
      ["#" profile (#+ Profile)]
@@ -42,7 +42,7 @@
      ["#." artifact (#+ Artifact)
       ["#/." type (#+ Type)]]
      ["#." repository #_
-      ["#/." origin]]]]})
+      ["#/." origin]]]]])
 
 (def: type
   (Random Type)
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux
index b92ebe145..30813fb94 100644
--- a/stdlib/source/test/aedifex/cli.lux
+++ b/stdlib/source/test/aedifex/cli.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     [pipe (#+ case>)]
     ["." try]
@@ -15,10 +14,10 @@
     ["." text ("#\." equivalence)]]
    [math
     ["." random (#+ Random) ("#\." monad)]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
-     ["#" profile]]]})
+     ["#" profile]]]])
 
 (def: compilation
   (Random /.Compilation)
diff --git a/stdlib/source/test/aedifex/command.lux b/stdlib/source/test/aedifex/command.lux
index 42d1c1278..1ba7e6319 100644
--- a/stdlib/source/test/aedifex/command.lux
+++ b/stdlib/source/test/aedifex/command.lux
@@ -14,8 +14,8 @@
    ["#." build]
    ["#." test]
    ["#." auto]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index effc80871..dfb4dc672 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -34,14 +34,14 @@
   ["." // #_
    ["$." version]
    ["$." build]]
-  {#program
+  [\\program
    ["." /
     ["//#" /// #_
      [command (#+ Command)]
      ["#" profile (#+ Profile)]
      ["#." action]
      [dependency
-      [resolution (#+ Resolution)]]]]})
+      [resolution (#+ Resolution)]]]]])
 
 (def: (command expected_runs end_signal fs dummy_file)
   (-> Nat Text (file.System Promise) file.Path
@@ -89,7 +89,7 @@
          
          expected_runs (\ ! map (|>> (n.% 10) (n.max 2)) random.nat)
          dummy_path (\ ! map (|>> (format source /)) (random.ascii/alpha 5))
-         resolution $build.resolution]
+         [compiler resolution] $build.resolution]
         ($_ _.and
             (wrap (do promise.monad
                     [verdict (do ///action.monad
@@ -99,6 +99,7 @@
                                 _ (\ watcher poll [])]
                                (do {! promise.monad}
                                  [no_dangling_process! (|> profile
+                                                           (set@ #///.compiler compiler)
                                                            ((/.do! 1 watcher command)
                                                             ($version.echo "")
                                                             (program.async (program.mock environment.empty home working_directory))
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index 9d37ceb00..191ac1039 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -16,7 +16,7 @@
     [collection
      ["." dictionary]]]
    [math
-    ["." random]]
+    ["." random (#+ Random)]]
    [world
     ["." file]
     ["." shell (#+ Shell)]
@@ -25,15 +25,15 @@
    ["@." version]
    ["$/#" // #_
     ["#." package]]]
-  {#program
+  [\\program
    ["." /
     ["//#" /// #_
      ["#" profile (#+ Profile)]
      ["#." action]
      ["#." artifact
       ["#/." type]]
-     ["#." dependency
-      ["#/." resolution]]]]})
+     ["#." dependency (#+ Dependency)
+      ["#/." resolution (#+ Resolution)]]]]])
 
 (def: #export good_shell
   (-> Any (Shell IO))
@@ -72,25 +72,35 @@
             (#try.Success [state shell.error]))))))))
 
 (def: compiler
+  (Random Dependency)
   (do random.monad
     [lux_version (random.ascii/alpha 5)
-     #let [jvm_compiler {#///dependency.artifact {#///artifact.group /.lux_group
-                                                  #///artifact.name /.jvm_compiler_name
-                                                  #///artifact.version lux_version}
-                         #///dependency.type ///artifact/type.lux_library}
-           js_compiler {#///dependency.artifact {#///artifact.group /.lux_group
+     #let [js_compiler {#///dependency.artifact {#///artifact.group /.lux_group
                                                  #///artifact.name /.js_compiler_name
                                                  #///artifact.version lux_version}
-                        #///dependency.type ///artifact/type.lux_library}]]
-    (random.either (wrap jvm_compiler)
-                   (wrap js_compiler))))
+                        #///dependency.type ///artifact/type.js_library}]]
+    (`` ($_ random.either
+            (wrap js_compiler)
+            (~~ (template [<compiler>]
+                  [(wrap {#///dependency.artifact {#///artifact.group /.lux_group
+                                                   #///artifact.name <compiler>
+                                                   #///artifact.version lux_version}
+                          #///dependency.type ///artifact/type.lux_library})]
+
+                  [/.jvm_compiler_name]
+                  [/.python_compiler_name]
+                  [/.lua_compiler_name]
+                  [/.ruby_compiler_name]
+                  ))))))
 
 (def: #export resolution
+  (Random [Dependency Resolution])
   (do random.monad
     [dependency ..compiler
      [_ package] $///package.random]
-    (wrap (|> ///dependency/resolution.empty
-              (dictionary.put dependency package)))))
+    (wrap [dependency
+           (|> ///dependency/resolution.empty
+               (dictionary.put dependency package))])))
 
 (def: #export test
   Test
@@ -136,10 +146,12 @@
                                 (exception.match? /.no_available_compiler error)))))
             (do !
               [#let [console (@version.echo "")]
-               resolution ..resolution]
+               [compiler resolution] ..resolution]
               (wrap (do promise.monad
                       [verdict (do ///action.monad
-                                 [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs shell resolution profile)
+                                 [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
+                                           fs shell resolution
+                                           (set@ #///.compiler compiler profile))
                                   start (\ console read_line [])
                                   end (\ console read_line [])]
                                  (wrap (and (text\= /.start start)
@@ -150,10 +162,12 @@
                                 (try.default false verdict)))))
             (do !
               [#let [console (@version.echo "")]
-               resolution ..resolution]
+               [compiler resolution] ..resolution]
               (wrap (do promise.monad
                       [verdict (do ///action.monad
-                                 [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async (..bad_shell [])) resolution profile)
+                                 [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
+                                           fs (shell.async (..bad_shell [])) resolution
+                                           (set@ #///.compiler compiler profile))
                                   start (\ console read_line [])
                                   end (\ console read_line [])]
                                  (wrap (and (text\= /.start start)
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index e23e99b96..6ee155b33 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -29,11 +29,11 @@
      [lux
       [data
        ["$." binary]]]]]]
-  {#program
+  [\\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 a40d8e394..7b3664da8 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -36,7 +36,7 @@
    [//
     ["$." profile]
     ["$." repository]]]
-  {#program
+  [\\program
    ["." /
     ["//#" /// #_
      ["#" profile]
@@ -46,7 +46,7 @@
      ["#." repository (#+ Repository)
       ["#/." remote]]
      ["#." artifact (#+ Artifact)
-      ["#/." extension]]]]})
+      ["#/." extension]]]]])
 
 (def: (execute! program repository fs artifact profile)
   (-> (Program Promise) (Repository Promise) (file.System Promise)
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index 819495c02..63561542d 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -32,7 +32,7 @@
     ["#." artifact]
     ["#." dependency #_
      ["#/." resolution]]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
      ["#." clean]
@@ -49,7 +49,7 @@
        ["#/." status]]
       ["#." repository
        ["#/." origin]
-       ["#/." local]]]]]})
+       ["#/." local]]]]]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index 0e8a95526..ae9885401 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -26,7 +26,7 @@
    [//
     ["$." profile]
     ["$." artifact]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
      ["/#" // #_
@@ -36,7 +36,7 @@
       ["#." artifact
        ["#/." extension]]
       ["#." repository #_
-       ["#/." local]]]]]})
+       ["#/." local]]]]]])
 
 (def: #export (make_sources! fs sources)
   (-> (file.System Promise) (Set file.Path) (Action (List Any)))
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 2ac23ec7a..39e2eecfc 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -22,12 +22,12 @@
    ["@." version]
    [//
     ["@." profile]]]
-  {#program
+  [\\program
    ["." /
     ["//#" /// #_
      ["#" profile]
      ["#." action]
-     ["#." pom]]]})
+     ["#." pom]]]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index 47e2ed2b3..a6029ba8c 100644
--- a/stdlib/source/test/aedifex/command/test.lux
+++ b/stdlib/source/test/aedifex/command/test.lux
@@ -26,7 +26,7 @@
    ["@." build]
    ["$/#" // #_
     ["#." package]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
      ["#." build]
@@ -36,7 +36,7 @@
       ["#." artifact
        ["#/." type]]
       ["#." dependency
-       ["#/." resolution]]]]]})
+       ["#/." resolution]]]]]])
 
 (def: #export test
   Test
@@ -56,13 +56,15 @@
                profile (|> empty_profile
                            with_test
                            with_target)]
-         resolution @build.resolution]
+         [compiler resolution] @build.resolution]
         ($_ _.and
             (let [fs (file.mock (\ file.default separator))
                   console (@version.echo "")]
               (wrap (do promise.monad
                       [verdict (do ///action.monad
-                                 [_ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async (@build.good_shell [])) resolution profile)
+                                 [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
+                                           fs (shell.async (@build.good_shell [])) resolution
+                                           (set@ #///.compiler compiler profile))
                                   build_start (\ console read_line [])
                                   build_end (\ console read_line [])
                                   test_start (\ console read_line [])
@@ -96,7 +98,9 @@
                                                                                    shell.normal
                                                                                    shell.error)]))))))
                                                    [])]
-                                  _ (/.do! console (program.async (program.mock environment.empty home working_directory)) fs (shell.async bad_shell) resolution profile)
+                                  _ (/.do! console (program.async (program.mock environment.empty home working_directory))
+                                           fs (shell.async bad_shell) resolution
+                                           (set@ #///.compiler compiler profile))
                                   build_start (\ console read_line [])
                                   build_end (\ console read_line [])
                                   test_start (\ console read_line [])
diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux
index 1bbb7f874..d3f815ed1 100644
--- a/stdlib/source/test/aedifex/command/version.lux
+++ b/stdlib/source/test/aedifex/command/version.lux
@@ -24,8 +24,8 @@
     ["." console (#+ Console Mock)]]]
   [///
    ["@." profile]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (exception: #export console_is_closed!)
 
diff --git a/stdlib/source/test/aedifex/dependency.lux b/stdlib/source/test/aedifex/dependency.lux
index 95fec9800..189da054c 100644
--- a/stdlib/source/test/aedifex/dependency.lux
+++ b/stdlib/source/test/aedifex/dependency.lux
@@ -3,15 +3,14 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [math
     ["." random (#+ Random)]]]
   [//
    ["@." artifact]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Dependency)
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index b947e609e..6e44e03db 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -34,7 +34,7 @@
   ["$." //
    ["#/" // #_
     ["#." package]]]
-  {#program
+  [\\program
    ["." /
     [// (#+ Dependency)
      ["." resolution]
@@ -46,7 +46,7 @@
        ["#/." type]
        ["#/." extension]]
       ["." repository
-       ["." remote]]]]]})
+       ["." remote]]]]]])
 
 (def: good_upload
   (@http.Response IO)
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index 6d25ffd4b..24cde0b53 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -4,9 +4,8 @@
    [abstract
     [monad (#+ do)]
     ["." predicate]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try]
     ["." exception]
@@ -33,7 +32,7 @@
    ["#." artifact]
    [command
     ["#." version]]]
-  {#program
+  [\\program
    ["." /
     ["//#" /// #_
      ["#" profile]
@@ -46,7 +45,7 @@
       ["#/." type]
       ["#/." extension]]
      ["#." repository (#+ Mock)
-      ["#/." origin]]]]})
+      ["#/." origin]]]]])
 
 (def: random
   (Random /.Resolution)
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index 90cc547fa..a709e6ca2 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -2,17 +2,16 @@
   [lux #*
    ["_" test (#+ Test)]
    [abstract
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [math
     ["." random (#+ Random) ("#\." monad)]]]
   ["$." /// #_
    ["#." hash]]
-  {#program
+  [\\program
    ["." /
     ["//#" /// #_
-     ["#." hash]]]})
+     ["#." hash]]]])
 
 (def: #export random
   (Random /.Status)
diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux
index 4c057be60..f4f6fe441 100644
--- a/stdlib/source/test/aedifex/hash.lux
+++ b/stdlib/source/test/aedifex/hash.lux
@@ -3,10 +3,9 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]
-      ["$." codec]]}]
+    [\spec
+     ["$." equivalence]
+     ["$." codec]]]
    [control
     ["." try]
     ["." exception]]
@@ -18,8 +17,8 @@
     ["." random (#+ Random)]
     [number
      ["n" nat]]]]
-  {#program
-   ["." /]}
+  [\\program
+   ["." /]]
   [test
    [lux
     [data
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index c379a8b0c..cf573bb25 100644
--- a/stdlib/source/test/aedifex/input.lux
+++ b/stdlib/source/test/aedifex/input.lux
@@ -20,7 +20,7 @@
     ["." file]]]
   [//
    ["$." profile]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
      ["#" profile (#+ Profile)]
@@ -28,7 +28,7 @@
      ["#." 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 3f6574ed9..89e4db9de 100644
--- a/stdlib/source/test/aedifex/local.lux
+++ b/stdlib/source/test/aedifex/local.lux
@@ -9,10 +9,10 @@
     ["." random (#+ Random)]]]
   [//
    ["@." artifact]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
-     ["#." artifact]]]})
+     ["#." artifact]]]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/metadata.lux b/stdlib/source/test/aedifex/metadata.lux
index 224ce4d80..2975939bc 100644
--- a/stdlib/source/test/aedifex/metadata.lux
+++ b/stdlib/source/test/aedifex/metadata.lux
@@ -12,8 +12,8 @@
    ["#." snapshot]
    [//
     ["$." artifact]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 6c3e509b1..56e856b88 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -23,8 +22,8 @@
     ["." random (#+ Random)]]
    [macro
     ["." code]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Metadata)
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 1858cae25..d94c66761 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try ("#\." functor)]
     [parser
@@ -29,12 +28,12 @@
     ["#/." time]
     ["#/." snapshot #_
      ["#/." version]]]]
-  {#program
+  [\\program
    ["." /
     [///
      [artifact
       [versioning (#+ Versioning)]
-      ["#." snapshot]]]]})
+      ["#." snapshot]]]]])
 
 (def: random_instant
   (Random Instant)
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 56daf3cad..61e36aaf7 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -3,9 +3,8 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [control
     ["." try]
     [concurrency
@@ -31,7 +30,7 @@
     [lux
      [data
       ["$." binary]]]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
      ["#" profile]
@@ -40,7 +39,7 @@
      [dependency
       ["#." status]]
      [repository
-      ["#." origin]]]]})
+      ["#." origin]]]]])
 
 (def: #export random
   (Random [//.Profile /.Package])
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index 07c426ebb..01c763349 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -23,14 +23,14 @@
     ["." code]]]
   [//
    ["@." profile]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
      ["#" profile]
      ["#." project (#+ Project)]
      ["#." artifact (#+ Artifact)]
      ["#." dependency (#+ Dependency)]
-     ["#." format]]]})
+     ["#." format]]]])
 
 (def: name
   (Random //.Name)
diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux
index 75b8cf5dc..ad3b1d801 100644
--- a/stdlib/source/test/aedifex/pom.lux
+++ b/stdlib/source/test/aedifex/pom.lux
@@ -15,10 +15,10 @@
     ["." random]]]
   [//
    ["@." profile]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
-     ["#" profile]]]})
+     ["#" profile]]]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 0a0ba8642..d4cbb958a 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -4,10 +4,9 @@
    [abstract
     [monad (#+ do)]
     [hash (#+ Hash)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]
-      ["$." monoid]]}]
+    [\spec
+     ["$." equivalence]
+     ["$." monoid]]]
    [control
     [pipe (#+ case>)]
     ["." try]
@@ -25,13 +24,13 @@
   [//
    ["@." artifact]
    ["@." dependency]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
      ["#." 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 5e26b63de..d2c12109f 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -3,10 +3,9 @@
    ["_" test (#+ Test)]
    [abstract
     [monad (#+ do)]
-    {[0 #spec]
-     [/
-      ["$." equivalence]
-      ["$." monoid]]}]
+    [\spec
+     ["$." equivalence]
+     ["$." monoid]]]
    [control
     ["." try ("#\." functor)]
     ["." exception]]
@@ -19,10 +18,10 @@
      ["n" nat]]]]
   [//
    ["@." profile]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
-     ["#" profile]]]})
+     ["#" profile]]]])
 
 (def: profile
   (Random [//.Name //.Profile])
diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux
index f9a4eeda6..6241e14e9 100644
--- a/stdlib/source/test/aedifex/repository.lux
+++ b/stdlib/source/test/aedifex/repository.lux
@@ -28,14 +28,14 @@
    ["#." remote]
    [//
     ["@." artifact]]]
-  {#spec
-   ["$." /]}
-  {#program
+  [\\spec
+   ["$." /]]
+  [\\program
    ["." /
     ["." remote]
     ["/#" // #_
      ["#." artifact (#+ Version Artifact)
-      ["#/." extension (#+ Extension)]]]]})
+      ["#/." 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 d2a7ce185..df454b436 100644
--- a/stdlib/source/test/aedifex/repository/identity.lux
+++ b/stdlib/source/test/aedifex/repository/identity.lux
@@ -2,13 +2,12 @@
   [lux #*
    ["_" test (#+ Test)]
    [abstract
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Identity)
diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux
index 946494437..5bf4c5113 100644
--- a/stdlib/source/test/aedifex/repository/local.lux
+++ b/stdlib/source/test/aedifex/repository/local.lux
@@ -19,8 +19,8 @@
    [world
     ["." file]
     ["." program]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export test
   Test
diff --git a/stdlib/source/test/aedifex/repository/origin.lux b/stdlib/source/test/aedifex/repository/origin.lux
index 4242a318a..7b3675f40 100644
--- a/stdlib/source/test/aedifex/repository/origin.lux
+++ b/stdlib/source/test/aedifex/repository/origin.lux
@@ -2,13 +2,12 @@
   [lux #*
    ["_" test (#+ Test)]
    [abstract
-    {[0 #spec]
-     [/
-      ["$." equivalence]]}]
+    [\spec
+     ["$." equivalence]]]
    [math
     ["." random (#+ Random)]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export random
   (Random /.Origin)
diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux
index f488391ce..0fa784a77 100644
--- a/stdlib/source/test/aedifex/repository/remote.lux
+++ b/stdlib/source/test/aedifex/repository/remote.lux
@@ -25,10 +25,10 @@
       ["#" client]
       ["#/." status]
       ["@#" /]]]]]
-  {#program
+  [\\program
    ["." /
     ["/#" // #_
-     ["#." identity]]]})
+     ["#." identity]]]])
 
 (def: (url_body url)
   (-> URL (@http.Body IO))
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index 0143eaac8..968e753f8 100644
--- a/stdlib/source/test/aedifex/runtime.lux
+++ b/stdlib/source/test/aedifex/runtime.lux
@@ -7,8 +7,8 @@
     ["." text]]
    [math
     ["." random]]]
-  {#program
-   ["." /]})
+  [\\program
+   ["." /]])
 
 (def: #export test
   Test