From 376c3e472fbb1e2656f8c61b26e0276570609aa1 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Mon, 13 Sep 2021 00:29:57 -0400
Subject: Updated only/except import syntax to take into account record =>
 variant syntax change.

---
 stdlib/source/test/aedifex/artifact.lux            |  8 +++----
 stdlib/source/test/aedifex/artifact/extension.lux  |  6 ++---
 stdlib/source/test/aedifex/artifact/snapshot.lux   |  6 ++---
 .../test/aedifex/artifact/snapshot/build.lux       |  6 ++---
 .../test/aedifex/artifact/snapshot/stamp.lux       |  6 ++---
 .../source/test/aedifex/artifact/snapshot/time.lux |  6 ++---
 .../test/aedifex/artifact/snapshot/version.lux     |  6 ++---
 .../aedifex/artifact/snapshot/version/value.lux    |  8 +++----
 stdlib/source/test/aedifex/artifact/time.lux       |  6 ++---
 stdlib/source/test/aedifex/artifact/time/date.lux  |  6 ++---
 stdlib/source/test/aedifex/artifact/time/time.lux  |  6 ++---
 stdlib/source/test/aedifex/artifact/type.lux       |  6 ++---
 stdlib/source/test/aedifex/artifact/versioning.lux |  6 ++---
 stdlib/source/test/aedifex/cache.lux               | 26 ++++++++++----------
 stdlib/source/test/aedifex/cli.lux                 |  8 +++----
 stdlib/source/test/aedifex/command.lux             |  2 +-
 stdlib/source/test/aedifex/command/auto.lux        | 24 +++++++++----------
 stdlib/source/test/aedifex/command/build.lux       | 20 ++++++++--------
 stdlib/source/test/aedifex/command/clean.lux       | 18 +++++++-------
 stdlib/source/test/aedifex/command/deploy.lux      | 16 ++++++-------
 stdlib/source/test/aedifex/command/deps.lux        |  8 +++----
 stdlib/source/test/aedifex/command/install.lux     | 16 ++++++-------
 stdlib/source/test/aedifex/command/pom.lux         |  4 ++--
 stdlib/source/test/aedifex/command/test.lux        |  6 ++---
 stdlib/source/test/aedifex/command/version.lux     | 12 +++++-----
 stdlib/source/test/aedifex/dependency.lux          |  6 ++---
 .../source/test/aedifex/dependency/deployment.lux  | 28 +++++++++++-----------
 .../source/test/aedifex/dependency/resolution.lux  | 18 +++++++-------
 stdlib/source/test/aedifex/dependency/status.lux   |  6 ++---
 stdlib/source/test/aedifex/hash.lux                | 10 ++++----
 stdlib/source/test/aedifex/input.lux               | 14 +++++------
 stdlib/source/test/aedifex/local.lux               |  6 ++---
 stdlib/source/test/aedifex/metadata.lux            |  4 ++--
 stdlib/source/test/aedifex/metadata/artifact.lux   |  6 ++---
 stdlib/source/test/aedifex/metadata/snapshot.lux   | 10 ++++----
 stdlib/source/test/aedifex/package.lux             | 10 ++++----
 stdlib/source/test/aedifex/parser.lux              | 20 ++++++++--------
 stdlib/source/test/aedifex/pom.lux                 |  4 ++--
 stdlib/source/test/aedifex/profile.lux             | 18 +++++++-------
 stdlib/source/test/aedifex/project.lux             |  6 ++---
 stdlib/source/test/aedifex/repository.lux          | 24 +++++++++----------
 stdlib/source/test/aedifex/repository/identity.lux |  4 ++--
 stdlib/source/test/aedifex/repository/local.lux    |  4 ++--
 stdlib/source/test/aedifex/repository/origin.lux   |  4 ++--
 stdlib/source/test/aedifex/repository/remote.lux   | 12 +++++-----
 stdlib/source/test/aedifex/runtime.lux             |  6 ++---
 46 files changed, 231 insertions(+), 231 deletions(-)

(limited to 'stdlib/source/test/aedifex')

diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux
index 8057a46bc..453f69ac8 100644
--- a/stdlib/source/test/aedifex/artifact.lux
+++ b/stdlib/source/test/aedifex/artifact.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
-     [hash {"+" [Hash]}]
+     [monad {"+" do}]
+     [hash {"+" Hash}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" order]
@@ -12,7 +12,7 @@
     [data
      ["[0]" text ("[1]#[0]" equivalence)]]
     [math
-     ["[0]" random {"+" [Random]}]]
+     ["[0]" random {"+" Random}]]
     [world
      ["[0]" file]
      [net
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index f346a6c77..08b4555e3 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)]
      [collection
       ["[0]" set]
       ["[0]" list]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\program
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index c89a0cede..01e5a30dd 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -11,7 +11,7 @@
      [parser
       ["<[0]>" xml]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]]]]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]]
   ["$[0]" / "_"
    ["[1][0]" build]
    ["[1][0]" stamp]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index 9bceb6737..c04029b4f 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -11,7 +11,7 @@
      [parser
       ["<[0]>" xml]]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [\\program
    ["[0]" /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index 8c403ec24..04438ab34 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -11,7 +11,7 @@
      [parser
       ["<[0]>" xml]]]
     [math
-     ["[0]" random {"+" [Random]}]]
+     ["[0]" random {"+" Random}]]
     [time
      ["[0]" instant]]]]
   [\\program
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index e74d3d370..0f38d31a1 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -11,7 +11,7 @@
      [parser
       ["<[0]>" text]]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [\\program
    ["[0]" /]]
   ["$[0]" /// "_"
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 367ddfe93..b798f67ea 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -11,7 +11,7 @@
      [parser
       ["<[0]>" xml]]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [\\program
    ["[0]" /]]
   ["[0]" / "_"
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index 156c403d7..d00dc53b7 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -12,9 +12,9 @@
       ["<[0]>" text]]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]
       ["i" int]]]
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index af64231ab..7f693d91a 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -13,7 +13,7 @@
     [time
      ["[0]" instant ("[1]#[0]" equivalence)]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["i" int]]]]]
   [\\program
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index 85f6b69f5..ce4ca415a 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -12,7 +12,7 @@
      [parser
       ["<[0]>" text]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" 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 983e81210..92d2c47ea 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]}]
+    ["_" test {"+" Test}]
     ["[0]" time]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try ("[1]#[0]" functor)]
      [parser
       ["<[0]>" text]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" 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 7b19d6c57..d407d3907 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      ["[0]" text]
      [collection
       ["[0]" set]
       ["[0]" list]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]]]
   [\\program
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index 963424469..adb5b36e1 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -11,7 +11,7 @@
      [parser
       ["<[0]>" xml]]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [\\program
    ["[0]" /]]
   ["$[0]" // "_"
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 989b205a3..33dab1686 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
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" try]
      [concurrency
-      ["[0]" async {"+" [Async]}]]
+      ["[0]" async {"+" Async}]]
      [parser
       ["[0]" environment]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" text]
      [format
-      [xml {"+" [XML]}]]
+      [xml {"+" XML}]]
      [collection
       ["[0]" set]
       ["[0]" dictionary]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]
     [world
@@ -35,13 +35,13 @@
   [\\program
    ["[0]" /
     ["/[1]" // "_"
-     ["[1]" profile {"+" [Profile]}]
-     ["[1][0]" package {"+" [Package]}]
+     ["[1]" profile {"+" Profile}]
+     ["[1][0]" package {"+" Package}]
      ["[1][0]" pom]
-     ["[1][0]" dependency {"+" [Dependency]}
-      ["[1]/[0]" resolution {"+" [Resolution]}]]
-     ["[1][0]" artifact {"+" [Artifact]}
-      ["[1]/[0]" type {"+" [Type]}]]
+     ["[1][0]" dependency {"+" Dependency}
+      ["[1]/[0]" resolution {"+" Resolution}]]
+     ["[1][0]" artifact {"+" Artifact}
+      ["[1]/[0]" type {"+" Type}]]
      ["[1][0]" repository "_"
       ["[1]/[0]" origin]]]]])
 
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux
index 16ae29ab4..29797d183 100644
--- a/stdlib/source/test/aedifex/cli.lux
+++ b/stdlib/source/test/aedifex/cli.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" try]
      [parser
       ["[0]" cli]]]
@@ -16,7 +16,7 @@
      [collection
       ["[0]" list]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]]]]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]]
   [\\program
    ["[0]" /
     ["/[1]" // "_"
diff --git a/stdlib/source/test/aedifex/command.lux b/stdlib/source/test/aedifex/command.lux
index 5cefcb033..ab9a2df31 100644
--- a/stdlib/source/test/aedifex/command.lux
+++ b/stdlib/source/test/aedifex/command.lux
@@ -1,7 +1,7 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]]]
+    ["_" test {"+" Test}]]]
   ["[0]" / "_"
    ["[1][0]" version]
    ["[1][0]" pom]
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index eab61d51f..86ffc7a7b 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" try]
      [parser
       ["[0]" environment]]
      [concurrency
-      ["[0]" atom {"+" [Atom]}]
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" atom {"+" Atom}]
+      ["[0]" async {"+" Async}]]]
     [data
      ["[0]" binary]
      ["[0]" text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
@@ -27,9 +27,9 @@
     [time
      ["[0]" instant]]
     [world
-     [console {"+" [Console]}]
-     ["[0]" shell {"+" [Exit Shell]}]
-     ["[0]" program {"+" [Program]}]
+     [console {"+" Console}]
+     ["[0]" shell {"+" Exit Shell}]
+     ["[0]" program {"+" Program}]
      ["[0]" file
       ["[0]" watch]]]]]
   ["[0]" // "_"
@@ -38,11 +38,11 @@
   [\\program
    ["[0]" /
     ["//[1]" /// "_"
-     [command {"+" [Command]}]
-     ["[1]" profile {"+" [Profile]}]
+     [command {"+" Command}]
+     ["[1]" profile {"+" Profile}]
      ["[1][0]" 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 722478571..05643780a 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
-     [io {"+" [IO]}]
+     [pipe {"+" case>}]
+     [io {"+" IO}]
      ["[0]" try]
      ["[0]" exception]
      [concurrency
-      ["[0]" async {"+" [Async]}]]
+      ["[0]" async {"+" Async}]]
      [parser
       ["[0]" environment]]]
     [data
@@ -18,10 +18,10 @@
      [collection
       ["[0]" dictionary]]]
     [math
-     ["[0]" random {"+" [Random]}]]
+     ["[0]" random {"+" Random}]]
     [world
      ["[0]" file]
-     ["[0]" shell {"+" [Shell]}]
+     ["[0]" shell {"+" Shell}]
      ["[0]" program]]]]
   ["[0]" // "_"
    ["@[0]" version]
@@ -30,12 +30,12 @@
   [\\program
    ["[0]" /
     ["//[1]" /// "_"
-     ["[1]" profile {"+" [Profile]}]
+     ["[1]" profile {"+" Profile}]
      ["[1][0]" action]
      ["[1][0]" artifact
       ["[1]/[0]" type]]
-     ["[1][0]" dependency {"+" [Dependency]}
-      ["[1]/[0]" resolution {"+" [Resolution]}]]]]])
+     ["[1][0]" dependency {"+" Dependency}
+      ["[1]/[0]" 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 8a9a69e7c..754bc4cd6 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" set]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]
     [world
-     ["[0]" file {"+" [Path]}]]]]
+     ["[0]" file {"+" Path}]]]]
   [//
    ["@[0]" version]
    [//
@@ -34,7 +34,7 @@
    ["[0]" /
     ["//[1]" /// "_"
      ["[1]" profile]
-     ["[1][0]" action {"+" [Action]}]]]])
+     ["[1][0]" 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 68e4de22c..c2d97b932 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]
+      ["[0]" async {"+" Async}]]
      [parser
       ["[0]" environment]]]
     [data
      ["[0]" binary ("[1]#[0]" equivalence)]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      ["[0]" format "_"
@@ -27,7 +27,7 @@
      ["[0]" random]]
     [world
      ["[0]" file]
-     ["[0]" program {"+" [Program]}]]]]
+     ["[0]" program {"+" Program}]]]]
   [program
    [compositor
     ["[0]" export]]]
@@ -44,9 +44,9 @@
      ["[1][0]" action]
      ["[1][0]" pom]
      ["[1][0]" hash]
-     ["[1][0]" repository {"+" [Repository]}
+     ["[1][0]" repository {"+" Repository}
       ["[1]/[0]" remote]]
-     ["[1][0]" artifact {"+" [Artifact]}
+     ["[1][0]" artifact {"+" Artifact}
       ["[1]/[0]" 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 812f4b745..2d8f467f3 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      ["[0]" predicate]]
     [control
      ["[0]" try]
@@ -13,7 +13,7 @@
       ["[0]" environment]]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
@@ -22,7 +22,7 @@
      [format
       ["[0]" xml]]]
     [math
-     ["[0]" random {"+" [Random]}]]
+     ["[0]" random {"+" Random}]]
     [world
      ["[0]" program]
      ["[0]" file]]]]
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index ba6f599fb..c8301828c 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]} ("[1]#[0]" functor)]
+     ["[0]" try {"+" Try} ("[1]#[0]" functor)]
      ["[0]" exception]
      [concurrency
-      ["[0]" async {"+" [Async]}]]
+      ["[0]" async {"+" Async}]]
      [parser
       ["[0]" environment]]]
     [data
      ["[0]" binary]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [math
      ["[0]" random]]
     [world
      ["[0]" file]
-     ["[0]" program {"+" [Program]}]]]]
+     ["[0]" program {"+" Program}]]]]
   [//
    ["$[0]" version]
    [//
@@ -32,7 +32,7 @@
     ["/[1]" // "_"
      ["/[1]" // "_"
       ["[1]" profile]
-      ["[1][0]" action {"+" [Action]}]
+      ["[1][0]" action {"+" Action}]
       ["[1][0]" local]
       ["[1][0]" artifact
        ["[1]/[0]" extension]]
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 47456bdba..049f147bf 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try ("[1]#[0]" functor)]
      [concurrency
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index 20a59f405..ca88c8c27 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try]
      ["[0]" exception]
@@ -32,7 +32,7 @@
     ["/[1]" // "_"
      ["[1][0]" build]
      ["/[1]" // "_"
-      ["[1]" profile {"+" [Profile]}]
+      ["[1]" profile {"+" Profile}]
       ["[1][0]" action]
       ["[1][0]" artifact
        ["[1]/[0]" type]]
diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux
index 423c88718..8c0b0c953 100644
--- a/stdlib/source/test/aedifex/command/version.lux
+++ b/stdlib/source/test/aedifex/command/version.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" maybe]
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [math
      ["[0]" random]]
     [tool
@@ -22,7 +22,7 @@
        ["[1]/[0]" lux "_"
         ["[1]" version]]]]]
     [world
-     ["[0]" console {"+" [Console Mock]}]]]]
+     ["[0]" console {"+" Console Mock}]]]]
   [///
    ["@[0]" profile]]
   [\\program
diff --git a/stdlib/source/test/aedifex/dependency.lux b/stdlib/source/test/aedifex/dependency.lux
index 370803dfa..736ede228 100644
--- a/stdlib/source/test/aedifex/dependency.lux
+++ b/stdlib/source/test/aedifex/dependency.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" order]
       ["$[0]" hash]]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [//
    ["@[0]" artifact]]
   [\\program
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index f3bb6b4a3..39ef3113e 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
-     ["[0]" hash {"+" [Hash]}]]
+     [monad {"+" do}]
+     ["[0]" hash {"+" Hash}]]
     [control
-     ["[0]" io {"+" [IO]}]
+     ["[0]" io {"+" IO}]
      ["[0]" maybe ("[1]#[0]" functor)]
      ["[0]" try ("[1]#[0]" functor)]
      [concurrency
-      ["[0]" atom {"+" [Atom]}]
+      ["[0]" atom {"+" Atom}]
       ["[0]" async]]]
     [data
      ["[0]" product]
-     ["[0]" binary {"+" [Binary]} ("[1]#[0]" equivalence)]
+     ["[0]" binary {"+" Binary} ("[1]#[0]" equivalence)]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" set]
       ["[0]" list ("[1]#[0]" mix)]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]
     [world
-     [net {"+" [URL]}
-      ["[0]" uri {"+" [URI]}]
+     [net {"+" URL}
+      ["[0]" uri {"+" URI}]
       ["[0]" http "_"
        ["[1]" client]
        ["[1]/[0]" status]
@@ -37,13 +37,13 @@
     ["[1][0]" package]]]
   [\\program
    ["[0]" /
-    [// {"+" [Dependency]}
+    [// {"+" Dependency}
      ["[0]" resolution]
      [//
       ["[0]" profile]
       ["[0]" metadata]
-      ["[0]" package {"+" [Package]}]
-      ["[0]" artifact {"+" [Artifact]} ("[1]#[0]" equivalence)
+      ["[0]" package {"+" Package}]
+      ["[0]" artifact {"+" Artifact} ("[1]#[0]" equivalence)
        ["[1]/[0]" type]
        ["[1]/[0]" extension]]
       ["[0]" repository
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index 01d516480..717656886 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      ["[0]" predicate]
      [\\specification
       ["$[0]" equivalence]]]
@@ -13,10 +13,10 @@
      [concurrency
       ["[0]" async]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [format
@@ -26,7 +26,7 @@
       ["[0]" set]
       ["[0]" list]]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   ["$[0]" /// "_"
    ["[1][0]" package]
    ["[1][0]" repository]
@@ -37,15 +37,15 @@
    ["[0]" /
     ["//[1]" /// "_"
      ["[1]" profile]
-     ["[1][0]" package {"+" [Package]}]
+     ["[1][0]" package {"+" Package}]
      ["[1][0]" hash]
-     ["[1][0]" dependency {"+" [Dependency]} ("[1]#[0]" equivalence)
+     ["[1][0]" dependency {"+" Dependency} ("[1]#[0]" equivalence)
       ["[1]/[0]" status]]
      ["[1][0]" pom]
-     ["[1][0]" artifact {"+" [Artifact]}
+     ["[1][0]" artifact {"+" Artifact}
       ["[1]/[0]" type]
       ["[1]/[0]" extension]]
-     ["[1][0]" repository {"+" [Mock]}
+     ["[1][0]" repository {"+" Mock}
       ["[1]/[0]" origin]]]]])
 
 (def: random
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index 0b487873f..34dd669a9 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [data
      ["[0]" binary "_"
       ["[1]T" \\test]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]]]]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]]
   ["$[0]" /// "_"
    ["[1][0]" hash]]
   [\\program
diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux
index 67dfa6b01..76b4e1cd9 100644
--- a/stdlib/source/test/aedifex/hash.lux
+++ b/stdlib/source/test/aedifex/hash.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" codec]]]
@@ -11,11 +11,11 @@
      ["[0]" try]
      ["[0]" exception]]
     [data
-     ["[0]" binary {"+" [Binary]}]
+     ["[0]" binary {"+" Binary}]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\program
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index a2f7d77a7..0e90e68dc 100644
--- a/stdlib/source/test/aedifex/input.lux
+++ b/stdlib/source/test/aedifex/input.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      [text
       ["%" format]
       [encoding
        ["[0]" utf8]]]
      [collection
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [math
      ["[0]" random]]
     [world
@@ -24,12 +24,12 @@
   [\\program
    ["[0]" /
     ["/[1]" // "_"
-     ["[1]" profile {"+" [Profile]}]
+     ["[1]" profile {"+" Profile}]
      ["[1][0]" project]
      ["[1][0]" action]
      ["[1][0]" 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 a2a943921..ad00db35c 100644
--- a/stdlib/source/test/aedifex/local.lux
+++ b/stdlib/source/test/aedifex/local.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      ["[0]" text]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [//
    ["@[0]" artifact]]
   [\\program
diff --git a/stdlib/source/test/aedifex/metadata.lux b/stdlib/source/test/aedifex/metadata.lux
index 093cf7937..719eb9ed0 100644
--- a/stdlib/source/test/aedifex/metadata.lux
+++ b/stdlib/source/test/aedifex/metadata.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)]]
     [math
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 29f074af9..b8a3beb09 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -21,7 +21,7 @@
     [macro
      ["[0]" code]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]
     ["[0]" time
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 8f90a45cf..4cfcaf3a2 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -21,14 +21,14 @@
     [macro
      ["[0]" code]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]
     ["[0]" time
      ["[0]" date]
      ["[0]" year]
      ["[0]" month]
-     ["[0]" instant {"+" [Instant]}]
+     ["[0]" instant {"+" Instant}]
      ["[0]" duration]]
     [world
      ["[0]" file]
@@ -44,7 +44,7 @@
     ["/[1]" //
      ["/[1]" // "_"
       [artifact
-       [versioning {"+" [Versioning]}]
+       [versioning {"+" Versioning}]
        ["[1][0]" snapshot]]
       ["[1][0]" repository "_"
        ["[1]/[0]" local]]]]]])
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 4d0f994d0..82c6e5b56 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -14,11 +14,11 @@
       [encoding
        ["[0]" utf8]]]
      [format
-      ["[0]" xml {"+" [XML]}]]
+      ["[0]" xml {"+" XML}]]
      [collection
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]
     [world
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index 183f04b27..8d74bac87 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
-     [hash {"+" [Hash]}]]
+     [monad {"+" do}]
+     [hash {"+" Hash}]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" try]
      [parser
       ["<[0]>" code]]]
     [data
      ["[0]" text]
      [collection
-      ["[0]" set {"+" [Set]}]
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" set {"+" Set}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]
     [macro
@@ -28,9 +28,9 @@
    ["[0]" /
     ["/[1]" // "_"
      ["[1]" profile]
-     ["[1][0]" project {"+" [Project]}]
-     ["[1][0]" artifact {"+" [Artifact]}]
-     ["[1][0]" dependency {"+" [Dependency]}]
+     ["[1][0]" project {"+" Project}]
+     ["[1][0]" artifact {"+" Artifact}]
+     ["[1][0]" dependency {"+" Dependency}]
      ["[1][0]" format]]]])
 
 (def: name
diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux
index fc9d47e00..4bd592f7d 100644
--- a/stdlib/source/test/aedifex/pom.lux
+++ b/stdlib/source/test/aedifex/pom.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try]
      ["[0]" exception]
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 284151725..7155aee3b 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -1,25 +1,25 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
-     [hash {"+" [Hash]}]
+     [monad {"+" do}]
+     [hash {"+" Hash}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" monoid]]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" try]
      [parser
       ["[0]" cli]]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)]
      [collection
-      ["[0]" set {"+" [Set]}]
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" set {"+" Set}]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]]]
   [//
@@ -29,10 +29,10 @@
    ["[0]" /
     ["/[1]" // "_"
      ["[1][0]" runtime]
-     ["[1][0]" dependency {"+" [Dependency]}]
+     ["[1][0]" dependency {"+" Dependency}]
      ["[1][0]" 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 90686e28e..cb98b38f9 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" monoid]]]
@@ -14,7 +14,7 @@
      ["[0]" product]
      ["[0]" text ("[1]#[0]" equivalence)]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]]]
   [//
diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux
index 9cc73f6c8..a25d9f5f9 100644
--- a/stdlib/source/test/aedifex/repository.lux
+++ b/stdlib/source/test/aedifex/repository.lux
@@ -1,27 +1,27 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [hash {"+" [Hash]}]
-     ["[0]" monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [hash {"+" Hash}]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" io]
      ["[0]" try]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" product]
-     ["[0]" binary {"+" [Binary]}]
+     ["[0]" binary {"+" Binary}]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]]]
+      ["[0]" dictionary {"+" Dictionary}]]]
     [math
-     ["[0]" random {"+" [Random]}]]
+     ["[0]" random {"+" Random}]]
     [world
      [net
-      ["[0]" uri {"+" [URI]}]]]]]
+      ["[0]" uri {"+" URI}]]]]]
   ["[0]" / "_"
    ["[1][0]" identity]
    ["[1][0]" origin]
@@ -35,8 +35,8 @@
    ["[0]" /
     ["[0]" remote]
     ["/[1]" // "_"
-     ["[1][0]" artifact {"+" [Version Artifact]}
-      ["[1]/[0]" extension {"+" [Extension]}]]]]])
+     ["[1][0]" artifact {"+" Version Artifact}
+      ["[1]/[0]" 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 971e18a4b..f8ba7145d 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]}]
+    ["_" test {"+" Test}]
     [abstract
      [\\specification
       ["$[0]" equivalence]]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [\\program
    ["[0]" /]])
 
diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux
index deb381511..88106fa82 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try ("[1]#[0]" functor)]
      [parser
diff --git a/stdlib/source/test/aedifex/repository/origin.lux b/stdlib/source/test/aedifex/repository/origin.lux
index f160df2e3..c4865d69a 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]}]
+    ["_" test {"+" Test}]
     [abstract
      [\\specification
       ["$[0]" equivalence]]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [\\program
    ["[0]" /]])
 
diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux
index 6d8811ffe..92380630c 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]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" io {"+" [IO]}]
+     ["[0]" io {"+" IO}]
      ["[0]" maybe ("[1]#[0]" functor)]
      ["[0]" try ("[1]#[0]" monad)]
      ["[0]" exception]
@@ -13,15 +13,15 @@
     [data
      ["[0]" binary ("[1]#[0]" equivalence)]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" dictionary]]]
     [math
-     ["[0]" random {"+" [Random]}]]
+     ["[0]" random {"+" Random}]]
     [world
-     [net {"+" [URL]}
+     [net {"+" URL}
       ["[0]" http "_"
        ["[1]" client]
        ["[1]/[0]" status]
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index fb94da435..77b6dac4c 100644
--- a/stdlib/source/test/aedifex/runtime.lux
+++ b/stdlib/source/test/aedifex/runtime.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -14,7 +14,7 @@
       ["[0]" list ("[1]#[0]" functor)]
       ["[0]" set]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]]]
   [\\program
-- 
cgit v1.2.3