Updated only/except import syntax to take into account record => variant syntax change.

47 files changed, 354 insertions, 354 deletions

diff --git a/stdlib/source/program/aedifex/action.lux b/stdlib/source/program/aedifex/action.lux
index 9923ea207..9f3d72207 100644
--- a/stdlib/source/program/aedifex/action.lux
+++ b/stdlib/source/program/aedifex/action.lux
@@ -2,11 +2,11 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [Monad]}]]
+     [monad {"+" Monad}]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]]])
+      ["[0]" async {"+" Async}]]]]])
 
 (type: .public (Action a)
   (Async (Try a)))
diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux
index e6e7bf949..cc97af80a 100644
--- a/stdlib/source/program/aedifex/artifact.lux
+++ b/stdlib/source/program/aedifex/artifact.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux {"-" [Name local]}
+   [lux {"-" Name local}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [order {"+" [Order]}]
-     [hash {"+" [Hash]}]]
+     [equivalence {"+" Equivalence}]
+     [order {"+" Order}]
+     [hash {"+" Hash}]]
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" order)
-      ["%" format {"+" [Format]}]]
+      ["%" format {"+" Format}]]
      [collection
       ["[0]" list ("[1]#[0]" monoid)]]]
     [world
-     ["[0]" file {"+" [Path]}]
+     ["[0]" file {"+" Path}]
      [net
-      ["[0]" uri {"+" [URI]}]]]]])
+      ["[0]" uri {"+" URI}]]]]])
 
 (type: .public Group
   Text)
diff --git a/stdlib/source/program/aedifex/artifact/extension.lux b/stdlib/source/program/aedifex/artifact/extension.lux
index 3150b9df4..df5fe17fe 100644
--- a/stdlib/source/program/aedifex/artifact/extension.lux
+++ b/stdlib/source/program/aedifex/artifact/extension.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [type]}
+   [lux {"-" type}
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [macro
      ["[0]" template]]]]
   ["[0]" // "_"
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index 16e10286e..aea20c0b4 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux {"-" [Name Type]}
+   [lux {"-" Name Type}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]
+      ["<[0]>" xml {"+" Parser}]
       ["<[0]>" text]]]
     [data
      ["[0]" sum]
      [format
-      ["[0]" xml {"+" [XML]}]]]]]
+      ["[0]" xml {"+" XML}]]]]]
   ["[0]" / "_"
-   ["[1][0]" stamp {"+" [Stamp]}]])
+   ["[1][0]" stamp {"+" Stamp}]])
 
 (type: .public Snapshot
   (Variant
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/build.lux b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
index 44adcc18b..e5a742264 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
@@ -2,17 +2,17 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]
+      ["<[0]>" xml {"+" Parser}]
       ["<[0]>" text]]]
     [data
      [text
       ["%" format]]
      [format
-      ["[0]" xml {"+" [XML]}]]]
+      ["[0]" xml {"+" XML}]]]
     [math
      [number
       ["[0]" nat]]]]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index f5a08e942..f40cf76e5 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -2,19 +2,19 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]
+      ["<[0]>" xml {"+" Parser}]
       ["<[0]>" text]]]
     [data
      ["[0]" product]
      [format
-      ["[0]" xml {"+" [XML]}]]]]]
+      ["[0]" xml {"+" XML}]]]]]
   ["[0]" // "_"
-   ["[1][0]" time {"+" [Time]}]
-   ["[1][0]" build {"+" [Build]}]])
+   ["[1][0]" time {"+" Time}]
+   ["[1][0]" build {"+" Build}]])
 
 (type: .public Stamp
   (Record
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/time.lux b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
index 0b0bb8227..e3871ff1c 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -2,20 +2,20 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
       ["<[0]>" text]
-      ["<[0]>" xml {"+" [Parser]}]]]
+      ["<[0]>" xml {"+" Parser}]]]
     [data
      [text
       ["%" format]]
      [format
-      ["[0]" xml {"+" [XML]}]]]
+      ["[0]" xml {"+" XML}]]]
     [time
-     ["[0]" instant {"+" [Instant]}]]]]
+     ["[0]" instant {"+" Instant}]]]]
   ["[0]" /// "_"
    ["[1][0]" time
     ["[1]/[0]" date]
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index 194956419..e2782c12a 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux {"-" [Type]}
+   [lux {"-" Type}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]
+      ["<[0]>" xml {"+" Parser}]
       ["<[0]>" text]]]
     [data
      ["[0]" product]
      ["[0]" text]
      [format
-      ["[0]" xml {"+" [XML]}]]]]]
+      ["[0]" xml {"+" XML}]]]]]
   ["[0]" /// "_"
-   ["[1][0]" type {"+" [Type]}]
-   ["[1][0]" time {"+" [Time]}]])
+   ["[1][0]" type {"+" Type}]
+   ["[1][0]" time {"+" Time}]])
 
 (type: .public Version
   (Record
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
index 12fe26c46..d2092b306 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -2,12 +2,12 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]]
+     [equivalence {"+" Equivalence}]]
     [data
      ["[0]" product]
      ["[0]" text
       ["%" format]]]]]
-  ["[0]" /// {"+" [Snapshot]}
+  ["[0]" /// {"+" Snapshot}
    ["[1][0]" time]
    ["[1][0]" stamp]])
 
diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux
index 7096d7420..0cc0a1267 100644
--- a/stdlib/source/program/aedifex/artifact/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time.lux
@@ -3,18 +3,18 @@
    [lux "*"
     ["[0]" time]
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      ["<>" parser
-      ["<[0]>" text {"+" [Parser]}]]]
+      ["<[0]>" text {"+" Parser}]]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [Format]}]]]
+      ["%" format {"+" Format}]]]
     [time
-     ["[0]" instant {"+" [Instant]}]]]]
+     ["[0]" instant {"+" Instant}]]]]
   ["[0]" / "_"
    ["[1][0]" date]
    ["[1][0]" time]])
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index 464c597c2..bc14e32e0 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]
-     [equivalence {"+" [Equivalence]}]]
+     [monad {"+" do}]
+     [equivalence {"+" Equivalence}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" text {"+" [Parser]}]]]
+      ["<[0]>" text {"+" Parser}]]]
     [data
      [text
       ["%" format]]]
diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux
index 8b3258c3a..4b77f6d1f 100644
--- a/stdlib/source/program/aedifex/artifact/time/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time/time.lux
@@ -3,10 +3,10 @@
    [lux "*"
     ["[0]" time]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["<>" parser
-      ["<[0]>" text {"+" [Parser]}]]]
+      ["<[0]>" text {"+" Parser}]]]
     [data
      [text
       ["%" format]]]
diff --git a/stdlib/source/program/aedifex/artifact/type.lux b/stdlib/source/program/aedifex/artifact/type.lux
index 659155f49..5115080c4 100644
--- a/stdlib/source/program/aedifex/artifact/type.lux
+++ b/stdlib/source/program/aedifex/artifact/type.lux
@@ -1,6 +1,6 @@
 (.module:
   [library
-   [lux {"-" [Type]}]])
+   [lux {"-" Type}]])
 
 ... https://maven.apache.org/ref/3.6.3/maven-core/artifact-handlers.html
 (type: .public Type
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 1e8d2cf04..09d8e4758 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -2,32 +2,32 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
-     ["[0]" exception {"+" [exception:]}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]
+      ["<[0]>" xml {"+" Parser}]
       ["<[0]>" text]]]
     [data
      ["[0]" product]
      ["[0]" text
       ["%" format]]
      [format
-      ["[0]" xml {"+" [XML]}]]
+      ["[0]" xml {"+" XML}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
      [number
       ["n" nat]]]
-    ["[0]" time {"+" [Time]}
-     ["[0]" date {"+" [Date]}]
+    ["[0]" time {"+" Time}
+     ["[0]" date {"+" Date}]
      ["[0]" year]
      ["[0]" month]]]]
   ["[0]" // "_"
    ["[1][0]" time]
-   ["[1][0]" snapshot {"+" [Snapshot]}
-    ["[1]/[0]" version {"+" [Version]}]]])
+   ["[1][0]" snapshot {"+" Snapshot}
+    ["[1]/[0]" version {"+" Version}]]])
 
 (type: .public Versioning
   (Record
diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux
index 9bc36f4c5..bedf1d993 100644
--- a/stdlib/source/program/aedifex/cli.lux
+++ b/stdlib/source/program/aedifex/cli.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux {"-" [Name]}
+   [lux {"-" Name}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
      ["<>" parser
-      ["[0]" cli {"+" [Parser]}]]]
+      ["[0]" cli {"+" Parser}]]]
     [data
      ["[0]" sum]
      ["[0]" product]
      ["[0]" text]]]]
   [//
    [repository
-    [identity {"+" [Identity]}]]
-   ["/" profile {"+" [Name]}]])
+    [identity {"+" Identity}]]
+   ["/" profile {"+" Name}]])
 
 (type: .public Compilation
   (Variant
diff --git a/stdlib/source/program/aedifex/command.lux b/stdlib/source/program/aedifex/command.lux
index 8594f0cfc..f30dbf70c 100644
--- a/stdlib/source/program/aedifex/command.lux
+++ b/stdlib/source/program/aedifex/command.lux
@@ -3,7 +3,7 @@
    [lux "*"]]
   ["[0]" // "_"
    ["[1]" profile]
-   ["[1][0]" action {"+" [Action]}]])
+   ["[1][0]" action {"+" Action}]])
 
 (type: .public (Command a)
   (-> //.Profile (Action a)))
diff --git a/stdlib/source/program/aedifex/command/auto.lux b/stdlib/source/program/aedifex/command/auto.lux
index 863251305..247160615 100644
--- a/stdlib/source/program/aedifex/command/auto.lux
+++ b/stdlib/source/program/aedifex/command/auto.lux
@@ -2,28 +2,28 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      [collection
       ["[0]" list]
       ["[0]" set]]]
     [world
-     [program {"+" [Program]}]
-     [shell {"+" [Exit Shell]}]
-     [console {"+" [Console]}]
+     [program {"+" Program}]
+     [shell {"+" Exit Shell}]
+     [console {"+" Console}]
      ["[0]" file
-      ["[0]" watch {"+" [Watcher]}]]]]]
+      ["[0]" watch {"+" Watcher}]]]]]
   ["[0]" // "_"
    ["/[1]" // "_"
-    [command {"+" [Command]}]
+    [command {"+" Command}]
     ["[1]" profile]
     ["[1][0]" action]
     [dependency
-     [resolution {"+" [Resolution]}]]]])
+     [resolution {"+" Resolution}]]]])
 
 (def: (targets fs path)
   (-> (file.System Async) file.Path (Async (List file.Path)))
diff --git a/stdlib/source/program/aedifex/command/build.lux b/stdlib/source/program/aedifex/command/build.lux
index d20b00479..19c7d86d9 100644
--- a/stdlib/source/program/aedifex/command/build.lux
+++ b/stdlib/source/program/aedifex/command/build.lux
@@ -1,45 +1,45 @@
 (.module:
   [library
-   [lux {"-" [Name]}
-    ["[0]" ffi {"+" [import:]}]
+   [lux {"-" Name}
+    ["[0]" ffi {"+" import:}]
     [abstract
-     [order {"+" [Order]}]
-     [monad {"+" [do]}]]
+     [order {"+" Order}]
+     [monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
-     ["[0]" io {"+" [IO]}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
+     ["[0]" io {"+" IO}]
      [concurrency
-      ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]]
+      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]]
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" order)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" set]]]
     [math
      [number
       ["n" nat]
       ["i" int]]]
     [world
-     ["[0]" program {"+" [Program]}]
-     ["[0]" file {"+" [Path]}]
-     ["[0]" shell {"+" [Exit Process Shell]}]
-     ["[0]" console {"+" [Console]}]
+     ["[0]" program {"+" Program}]
+     ["[0]" file {"+" Path}]
+     ["[0]" shell {"+" Exit Process Shell}]
+     ["[0]" console {"+" Console}]
      [net
       ["[0]" uri]]]]]
   ["[0]" /// "_"
    ["[1]" profile]
    ["[1][0]" action]
-   ["[1][0]" command {"+" [Command]}]
+   ["[1][0]" command {"+" Command}]
    ["[1][0]" local]
    ["[1][0]" repository]
    ["[1][0]" runtime]
-   ["[1][0]" dependency {"+" [Dependency]}
-    ["[1]/[0]" resolution {"+" [Resolution]}]]
-   ["[1][0]" artifact {"+" [Group Name Version Artifact]}
+   ["[1][0]" dependency {"+" Dependency}
+    ["[1]/[0]" resolution {"+" Resolution}]]
+   ["[1][0]" artifact {"+" Group Name Version Artifact}
     ["[1]/[0]" type]]])
 
 (type: Finder
diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux
index bbdec8763..0e15592e4 100644
--- a/stdlib/source/program/aedifex/command/clean.lux
+++ b/stdlib/source/program/aedifex/command/clean.lux
@@ -2,21 +2,21 @@
   [library
    [lux "*"
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
-     [try {"+" [Try]}]
+     [try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [world
-     ["[0]" file {"+" [Path]}]
-     ["[0]" console {"+" [Console]}]]]]
+     ["[0]" file {"+" Path}]
+     ["[0]" console {"+" Console}]]]]
   ["[0]" /// "_"
-   [command {"+" [Command]}]
+   [command {"+" Command}]
    ["[1]" profile]
-   ["[1][0]" action {"+" [Action]}]])
+   ["[1][0]" action {"+" Action}]])
 
 (def: (clean_files! fs root)
   (-> (file.System Async) Path (Async (Try Any)))
diff --git a/stdlib/source/program/aedifex/command/deploy.lux b/stdlib/source/program/aedifex/command/deploy.lux
index d6d783113..775d52529 100644
--- a/stdlib/source/program/aedifex/command/deploy.lux
+++ b/stdlib/source/program/aedifex/command/deploy.lux
@@ -2,18 +2,18 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     [pipe {"+" [do>]}]
-     ["[0]" try {"+" [Try]}]
+     [pipe {"+" do>}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]
+      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]
      ["<>" parser
       ["<[0]>" xml]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      [text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
@@ -23,34 +23,34 @@
       ["[0]" tar]
       ["[0]" xml]]]
     [time
-     ["[0]" instant {"+" [Instant]}]]
+     ["[0]" instant {"+" Instant}]]
     [world
      ["[0]" file]
-     ["[0]" console {"+" [Console]}]]]]
+     ["[0]" console {"+" Console}]]]]
   [program
    [compositor
     ["[0]" export]]]
   ["[0]" // "_"
    ["[1][0]" clean]
    ["/[1]" // "_"
-    [command {"+" [Command]}]
+    [command {"+" Command}]
     ["/" profile]
-    ["[1][0]" action {"+" [Action]}]
+    ["[1][0]" action {"+" Action}]
     ["[1][0]" pom]
     ["[1][0]" hash]
     ["[1][0]" package]
     ["[1][0]" dependency
      ["[1]/[0]" deployment]
-     ["[1]/[0]" status {"+" [Status]}]]
-    ["[1][0]" repository {"+" [Repository]}
-     [identity {"+" [Identity]}]
+     ["[1]/[0]" status {"+" Status}]]
+    ["[1][0]" repository {"+" Repository}
+     [identity {"+" Identity}]
      ["[1]/[0]" remote]
      ["[1]/[0]" origin]]
     ["[1][0]" metadata
      ["[1]/[0]" artifact]
      ["[1]/[0]" snapshot]]
-    ["[1][0]" artifact {"+" [Artifact]}
-     ["[1]/[0]" extension {"+" [Extension]}]
+    ["[1][0]" artifact {"+" Artifact}
+     ["[1]/[0]" extension {"+" Extension}]
      ["[1]/[0]" type]]]])
 
 (def: .public success
diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index 50df346db..654f00156 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -2,33 +2,33 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" exception]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      [collection
-      ["[0]" set {"+" [Set]}]
+      ["[0]" set {"+" Set}]
       ["[0]" list ("[1]#[0]" mix)]
       ["[0]" dictionary]]
      [text
       ["%" format]]]
     [world
-     [net {"+" [URL]}]
-     [program {"+" [Program]}]
+     [net {"+" URL}]
+     [program {"+" Program}]
      ["[0]" file]
-     ["[0]" console {"+" [Console]}]]]]
+     ["[0]" console {"+" Console}]]]]
   ["[0]" // "_"
    ["[1][0]" clean]
    ["/[1]" // "_"
-    [command {"+" [Command]}]
-    [repository {"+" [Repository]}]
+    [command {"+" Command}]
+    [repository {"+" Repository}]
     ["[1]" profile]
-    ["[1][0]" action {"+" [Action]}]
-    ["[1][0]" artifact {"+" [Artifact]}]
-    ["[1][0]" dependency {"+" [Dependency]}
-     ["[1]/[0]" resolution {"+" [Resolution]}]
+    ["[1][0]" action {"+" Action}]
+    ["[1][0]" artifact {"+" Artifact}]
+    ["[1][0]" dependency {"+" Dependency}
+     ["[1]/[0]" resolution {"+" Resolution}]
      ["[1]/[0]" deployment]]]])
 
 (def: format
diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux
index d89773504..3436adf17 100644
--- a/stdlib/source/program/aedifex/command/install.lux
+++ b/stdlib/source/program/aedifex/command/install.lux
@@ -2,14 +2,14 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      ["[0]" exception]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      [text
       [encoding
        ["[0]" utf8]]]
@@ -20,27 +20,27 @@
       ["[0]" tar]
       ["[0]" xml]]]
     [world
-     [program {"+" [Program]}]
+     [program {"+" Program}]
      ["[0]" file]
-     ["[0]" console {"+" [Console]}]]]]
+     ["[0]" console {"+" Console}]]]]
   [program
    [compositor
     ["[0]" export]]]
   ["[0]" // "_"
    ["[1][0]" clean]
    ["/[1]" // "_"
-    ["/" profile {"+" [Profile]}]
-    ["[1][0]" action {"+" [Action]}]
-    ["[1][0]" command {"+" [Command]}]
+    ["/" profile {"+" Profile}]
+    ["[1][0]" action {"+" Action}]
+    ["[1][0]" command {"+" Command}]
     ["[1][0]" local]
     ["[1][0]" pom]
     ["[1][0]" package]
-    [repository {"+" [Repository]}
+    [repository {"+" Repository}
      ["[1][0]" origin]]
     ["[1][0]" dependency "_"
      ["[1]/[0]" deployment]
      ["[1]/[0]" status]]
-    ["[1][0]" artifact {"+" [Artifact]}
+    ["[1][0]" artifact {"+" Artifact}
      ["[1]/[0]" type]]]])
 
 (def: .public success
diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux
index f4eee1c2b..56e19488a 100644
--- a/stdlib/source/program/aedifex/command/pom.lux
+++ b/stdlib/source/program/aedifex/command/pom.lux
@@ -2,23 +2,23 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try ("[1]#[0]" functor)]
      [concurrency
-      ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]]
+      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]]
     [data
      [text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [format
       ["[0]" xml]]]
     [world
      ["[0]" file]
-     ["[0]" console {"+" [Console]}]]]]
+     ["[0]" console {"+" Console}]]]]
   ["[0]" /// "_"
-   [command {"+" [Command]}]
+   [command {"+" Command}]
    ["[1][0]" action]
    ["[1][0]" pom]])
 
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index d017dd228..dc4b7a7e4 100644
--- a/stdlib/source/program/aedifex/command/test.lux
+++ b/stdlib/source/program/aedifex/command/test.lux
@@ -1,28 +1,28 @@
 (.module:
   [library
-   [lux {"-" [Name]}
+   [lux {"-" Name}
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      [concurrency
-      ["[0]" async {"+" [Async]} ("[1]#[0]" monad)]]]
+      ["[0]" async {"+" Async} ("[1]#[0]" monad)]]]
     [math
      [number
       ["i" int]]]
     [world
-     ["[0]" program {"+" [Program]}]
+     ["[0]" program {"+" Program}]
      ["[0]" file]
-     ["[0]" shell {"+" [Exit Shell]}]
-     ["[0]" console {"+" [Console]}]]]]
+     ["[0]" shell {"+" Exit Shell}]
+     ["[0]" console {"+" Console}]]]]
   ["[0]" // "_"
    ["[1][0]" build]
    ["/[1]" // "_"
     ["[1]" profile]
     ["[1][0]" action]
-    ["[1][0]" command {"+" [Command]}]
+    ["[1][0]" command {"+" Command}]
     ["[1][0]" runtime]
     [dependency
-     [resolution {"+" [Resolution]}]]]])
+     [resolution {"+" Resolution}]]]])
 
 (def: .public start "[TEST STARTED]")
 (def: .public success "[TEST ENDED]")
diff --git a/stdlib/source/program/aedifex/command/version.lux b/stdlib/source/program/aedifex/command/version.lux
index 11883dd86..9e01d2672 100644
--- a/stdlib/source/program/aedifex/command/version.lux
+++ b/stdlib/source/program/aedifex/command/version.lux
@@ -3,7 +3,7 @@
    [lux "*"
     [control
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [tool
      [compiler
       ["[0]" version]
@@ -11,9 +11,9 @@
        ["[1]/[0]" lux "_"
         ["[1]" version]]]]]
     [world
-     ["[0]" console {"+" [Console]}]]]]
+     ["[0]" console {"+" Console}]]]]
   [///
-   [command {"+" [Command]}]])
+   [command {"+" Command}]])
 
 (def: .public (do! console profile)
   (-> (Console Async) (Command Any))
diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux
index 451accd25..318152c5c 100644
--- a/stdlib/source/program/aedifex/dependency.lux
+++ b/stdlib/source/program/aedifex/dependency.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux {"-" [Type]}
+   [lux {"-" Type}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [order {"+" [Order]}]
-     [hash {"+" [Hash]}]]
+     [equivalence {"+" Equivalence}]
+     [order {"+" Order}]
+     [hash {"+" Hash}]]
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" order)
-      ["%" format {"+" [format]}]]]]]
+      ["%" format {"+" format}]]]]]
   ["[0]" // "_"
-   ["[1]" artifact {"+" [Artifact]} ("[1]#[0]" order)
-    [type {"+" [Type]}]]])
+   ["[1]" artifact {"+" Artifact} ("[1]#[0]" order)
+    [type {"+" Type}]]])
 
 (type: .public Dependency
   (Record
diff --git a/stdlib/source/program/aedifex/dependency/deployment.lux b/stdlib/source/program/aedifex/dependency/deployment.lux
index 843b24917..29f49b61a 100644
--- a/stdlib/source/program/aedifex/dependency/deployment.lux
+++ b/stdlib/source/program/aedifex/dependency/deployment.lux
@@ -2,43 +2,43 @@
   [library
    [lux "*"
     [abstract
-     [codec {"+" [Codec]}]
-     ["[0]" monad {"+" [do]}]]
+     [codec {"+" Codec}]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [collection
       ["[0]" dictionary]
-      ["[0]" set {"+" [Set]}]
+      ["[0]" set {"+" Set}]
       ["[0]" list ("[1]#[0]" monoid)]]]
     [time
-     ["[0]" instant {"+" [Instant]}]]]]
+     ["[0]" instant {"+" Instant}]]]]
   ["[0]" /// "_"
-   [repository {"+" [Repository]}]
-   ["[1][0]" hash {"+" [Hash]}]
-   ["[1][0]" package {"+" [Package]}]
-   ["[1][0]" artifact {"+" [Artifact]}
+   [repository {"+" Repository}]
+   ["[1][0]" hash {"+" Hash}]
+   ["[1][0]" package {"+" Package}]
+   ["[1][0]" artifact {"+" Artifact}
     ["[1]/[0]" time]
     ["[1]/[0]" type]
-    ["[1]/[0]" extension {"+" [Extension]}]
+    ["[1]/[0]" extension {"+" Extension}]
     ["[1]/[0]" versioning]
     ["[1]/[0]" snapshot
      ["[1]/[0]" version
       ["[1]/[0]" value]]]]
    ["[1][0]" metadata "_"
     ["[1]/[0]" artifact]
-    ["[1]/[0]" snapshot {"+" [Metadata]}]]
-   ["[1][0]" dependency {"+" [Dependency]}
-    [resolution {"+" [Resolution]}]
-    ["[1]/[0]" status {"+" [Status]}]]])
+    ["[1]/[0]" snapshot {"+" Metadata}]]
+   ["[1][0]" dependency {"+" Dependency}
+    [resolution {"+" Resolution}]
+    ["[1]/[0]" status {"+" Status}]]])
 
 (def: (with_status repository version_template [artifact type] [data status])
   (-> (Repository Async) ///artifact.Version Dependency [Binary Status] (Async (Try Any)))
diff --git a/stdlib/source/program/aedifex/dependency/resolution.lux b/stdlib/source/program/aedifex/dependency/resolution.lux
index c5cdce6b8..7f5c2ecca 100644
--- a/stdlib/source/program/aedifex/dependency/resolution.lux
+++ b/stdlib/source/program/aedifex/dependency/resolution.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux {"-" [Name]}
+   [lux {"-" Name}
     ["@" target]
     ["[0]" debug]
-    ["[0]" ffi {"+" [import:]}]
+    ["[0]" ffi {"+" import:}]
     [abstract
-     [codec {"+" [Codec]}]
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]
-     ["[0]" predicate {"+" [Predicate]}]]
+     [codec {"+" Codec}]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]
+     ["[0]" predicate {"+" Predicate}]]
     [control
      ["[0]" maybe]
-     ["[0]" try {"+" [Try]} ("[1]#[0]" functor)]
-     ["[0]" exception {"+" [Exception exception:]}]
+     ["[0]" try {"+" Try} ("[1]#[0]" functor)]
+     ["[0]" exception {"+" Exception exception:}]
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]]
+      ["<[0]>" xml {"+" Parser}]]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
-     ["[0]" binary {"+" [Binary]}]
+     ["[0]" binary {"+" Binary}]
      ["[0]" name]
      ["[0]" text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]
      [format
-      ["[0]" xml {"+" [Tag XML]}]]
+      ["[0]" xml {"+" Tag XML}]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" set]
       ["[0]" list ("[1]#[0]" functor monoid)]]]
     [math
@@ -35,27 +35,27 @@
       ["n" nat]
       ["[0]" i64]]]
     [world
-     [console {"+" [Console]}]
-     [net {"+" [URL]}
+     [console {"+" Console}]
+     [net {"+" URL}
       ["[0]" uri]
       ["[0]" http "_"
        ["[1]" client]]]]]]
-  ["[0]" // {"+" [Dependency]}
-   ["[1][0]" status {"+" [Status]}]
+  ["[0]" // {"+" Dependency}
+   ["[1][0]" status {"+" Status}]
    ["/[1]" // "_"
     ["/" profile]
-    ["[1][0]" hash {"+" [Hash SHA-1 MD5]}]
+    ["[1][0]" hash {"+" Hash SHA-1 MD5}]
     ["[1][0]" pom]
-    ["[1][0]" package {"+" [Package]}]
-    ["[1][0]" artifact {"+" [Version Artifact]}
-     ["[1]/[0]" extension {"+" [Extension]}]
+    ["[1][0]" package {"+" Package}]
+    ["[1][0]" artifact {"+" Version Artifact}
+     ["[1]/[0]" extension {"+" Extension}]
      ["[1]/[0]" versioning]
      ["[0]" snapshot
       [version
        ["[0]" value]]]]
-    ["[1][0]" repository {"+" [Repository]}
-     ["[1]/[0]" remote {"+" [Address]}]
-     ["[1]/[0]" origin {"+" [Origin]}]]
+    ["[1][0]" repository {"+" Repository}
+     ["[1]/[0]" remote {"+" Address}]
+     ["[1]/[0]" origin {"+" Origin}]]
     ["[1][0]" metadata
      ["[1]/[0]" snapshot]]]])
 
diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux
index 0be99a0fe..6942fb75b 100644
--- a/stdlib/source/program/aedifex/dependency/status.lux
+++ b/stdlib/source/program/aedifex/dependency/status.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]]
+     [equivalence {"+" Equivalence}]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" sum]
      ["[0]" product]]]]
   ["[0]" /// "_"
-   ["[1][0]" hash {"+" [Hash SHA-1 MD5]}]])
+   ["[1][0]" hash {"+" Hash SHA-1 MD5}]])
 
 (type: .public Status
   (Variant
diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux
index 31471fa83..1518b50a2 100644
--- a/stdlib/source/program/aedifex/format.lux
+++ b/stdlib/source/program/aedifex/format.lux
@@ -4,18 +4,18 @@
     [data
      ["[0]" text ("[1]#[0]" equivalence)]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" list ("[1]#[0]" monad)]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [macro
      ["[0]" code]
      ["[0]" template]]]]
   ["[0]" // "_"
    ["/" profile]
-   ["[1][0]" runtime {"+" [Runtime]}]
-   ["[1][0]" project {"+" [Project]}]
-   ["[1][0]" dependency {"+" [Dependency]}]
-   ["[1][0]" artifact {"+" [Artifact]}
+   ["[1][0]" runtime {"+" Runtime}]
+   ["[1][0]" project {"+" Project}]
+   ["[1][0]" dependency {"+" Dependency}]
+   ["[1][0]" artifact {"+" Artifact}
     ["[1]/[0]" type]]])
 
 (type: .public (Format a)
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 21b9abeff..6fa565867 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
    [lux "*"
-    ["[0]" ffi {"+" [import:]}]
+    ["[0]" ffi {"+" import:}]
     [abstract
-     [codec {"+" [Codec]}]
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]]
+     [codec {"+" Codec}]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]]
     [data
-     ["[0]" binary {"+" [Binary]}]
+     ["[0]" binary {"+" Binary}]
      ["[0]" text
-      ["%" format {"+" [Format format]}]
+      ["%" format {"+" Format format}]
       ["[0]" encoding]]]
     [math
      [number
diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux
index 9d470f772..ea33629d5 100644
--- a/stdlib/source/program/aedifex/input.lux
+++ b/stdlib/source/program/aedifex/input.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
-   [lux {"-" [Name]}
+   [lux {"-" Name}
     [abstract
-     ["[0]" monad {"+" [Monad do]}]
+     ["[0]" monad {"+" Monad do}]
      ["[0]" mix]]
     [control
-     [pipe {"+" [do>]}]
-     ["[0]" try {"+" [Try]}]
+     [pipe {"+" do>}]
+     ["[0]" try {"+" Try}]
      [parser
       ["<[0]>" code]]]
     [data
-     [binary {"+" [Binary]}]
+     [binary {"+" Binary}]
      ["[0]" text
       [encoding
        ["[0]" utf8]]]
@@ -26,8 +26,8 @@
     [world
      ["[0]" file]]]]
   ["[0]" // "_"
-   ["[1][0]" profile {"+" [Name Profile]}]
-   ["[1][0]" project {"+" [Project]}]
+   ["[1][0]" profile {"+" Name Profile}]
+   ["[1][0]" project {"+" Project}]
    ["[1][0]" parser]])
 
 (def: (lux_parser source_code)
diff --git a/stdlib/source/program/aedifex/local.lux b/stdlib/source/program/aedifex/local.lux
index c901cc8a1..770f68cd6 100644
--- a/stdlib/source/program/aedifex/local.lux
+++ b/stdlib/source/program/aedifex/local.lux
@@ -3,12 +3,12 @@
    [lux "*"
     [data
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [world
      [net
-      ["[0]" uri {"+" [URI]}]]]]]
+      ["[0]" uri {"+" URI}]]]]]
   ["[0]" // "_"
-   ["[1][0]" artifact {"+" [Version Artifact]}]])
+   ["[1][0]" artifact {"+" Version Artifact}]])
 
 (def: / uri.separator)
 
diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux
index 83320d752..e4f6bf3e1 100644
--- a/stdlib/source/program/aedifex/metadata.lux
+++ b/stdlib/source/program/aedifex/metadata.lux
@@ -3,13 +3,13 @@
    [lux "*"
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [world
-     [file {"+" [Path]}]
+     [file {"+" Path}]
      [net
-      ["[0]" uri {"+" [URI]}]]]]]
+      ["[0]" uri {"+" URI}]]]]]
   ["[0]" // "_"
-   ["[1][0]" artifact {"+" [Artifact]}]])
+   ["[1][0]" artifact {"+" Artifact}]])
 
 (def: remote_file
   Path
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index 2bae67087..603386212 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux {"-" [Name]}
+   [lux {"-" Name}
     [abstract
-     [monad {"+" [do]}]
-     [equivalence {"+" [Equivalence]}]]
+     [monad {"+" do}]
+     [equivalence {"+" Equivalence}]]
     [control
-     [pipe {"+" [do>]}]
-     ["[0]" try {"+" [Try]}]
+     [pipe {"+" do>}]
+     ["[0]" try {"+" Try}]
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]
+      ["<[0]>" xml {"+" Parser}]
       ["<[0]>" text]]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      ["[0]" product]
      ["[0]" text
@@ -19,24 +19,24 @@
       [encoding
        ["[0]" utf8]]]
      [format
-      ["[0]" xml {"+" [XML]}]]
+      ["[0]" xml {"+" XML}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
      [number
       ["n" nat]]]
-    ["[0]" time {"+" [Time]}
-     ["[0]" instant {"+" [Instant]}]
-     ["[0]" date {"+" [Date]}]
+    ["[0]" time {"+" Time}
+     ["[0]" instant {"+" Instant}]
+     ["[0]" date {"+" Date}]
      ["[0]" year]
      ["[0]" month]]
     [world
      [net
-      ["[0]" uri {"+" [URI]}]]]]]
+      ["[0]" uri {"+" URI}]]]]]
   ["[0]" //
    ["/[1]" // "_"
-    [repository {"+" [Repository]}]
-    ["[1][0]" artifact {"+" [Group Name Version Artifact]}]]])
+    [repository {"+" Repository}]
+    ["[1][0]" artifact {"+" Group Name Version Artifact}]]])
 
 (type: .public Metadata
   (Record
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 982d15556..5a784a18f 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux {"-" [Name Type]}
+   [lux {"-" Name Type}
     [abstract
-     [monad {"+" [do]}]
-     [equivalence {"+" [Equivalence]}]]
+     [monad {"+" do}]
+     [equivalence {"+" Equivalence}]]
     [control
-     [pipe {"+" [do> case>]}]
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]
+     [pipe {"+" do> case>}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]
+      ["<[0]>" xml {"+" Parser}]
       ["<[0]>" text]]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      ["[0]" product]
      ["[0]" text
@@ -20,27 +20,27 @@
       [encoding
        ["[0]" utf8]]]
      [format
-      ["[0]" xml {"+" [XML]}]]
+      ["[0]" xml {"+" XML}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
      [number
       ["n" nat]]]
-    ["[0]" time {"+" [Time]}
-     ["[0]" instant {"+" [Instant]}]
-     ["[0]" date {"+" [Date]}]
+    ["[0]" time {"+" Time}
+     ["[0]" instant {"+" Instant}]
+     ["[0]" date {"+" Date}]
      ["[0]" year]
      ["[0]" month]]
     [world
      [net
-      ["[0]" uri {"+" [URI]}]]]]]
+      ["[0]" uri {"+" URI}]]]]]
   ["[0]" //
    ["/[1]" // "_"
-    [repository {"+" [Repository]}]
-    ["[1][0]" artifact {"+" [Group Name Version Artifact]}
+    [repository {"+" Repository}]
+    ["[1][0]" artifact {"+" Group Name Version Artifact}
      ["[1]/[0]" time]
-     ["[1]/[0]" type {"+" [Type]}]
-     ["[1]/[0]" versioning {"+" [Versioning]}]
+     ["[1]/[0]" type {"+" Type}]
+     ["[1]/[0]" versioning {"+" Versioning}]
      ["[1]/[0]" snapshot
       ["[1]/[0]" version]
       ["[1]/[0]" stamp]]]]])
diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index 6a8e89c57..a65f057dd 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -1,32 +1,32 @@
 (.module:
   [library
-   [lux {"-" [local]}
+   [lux {"-" local}
     [abstract
-     [equivalence {"+" [Equivalence]}]]
+     [equivalence {"+" Equivalence}]]
     [control
-     ["[0]" try {"+" [Try]} ("[1]#[0]" functor)]
+     ["[0]" try {"+" Try} ("[1]#[0]" functor)]
      [parser
       ["<[0]>" xml]]]
     [data
      ["[0]" sum]
      ["[0]" product]
-     ["[0]" binary {"+" [Binary]}]
+     ["[0]" binary {"+" Binary}]
      [text
       [encoding
        ["[0]" utf8]]]
      [format
-      ["[0]" xml {"+" [XML]}]]
+      ["[0]" xml {"+" XML}]]
      [collection
-      [set {"+" [Set]}]]]]]
+      [set {"+" Set}]]]]]
   ["[0]" // "_"
    ["/" profile]
    ["[1][0]" hash]
    ["[1][0]" pom]
-   [dependency {"+" [Dependency]}
-    ["[1][0]" status {"+" [Status]}]]
+   [dependency {"+" Dependency}
+    ["[1][0]" status {"+" Status}]]
    [repository
-    [remote {"+" [Address]}]
-    ["[1][0]" origin {"+" [Origin]}]]])
+    [remote {"+" Address}]
+    ["[1][0]" origin {"+" Origin}]]])
 
 (type: .public Package
   (Record
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 80eb1bfea..ae64cb30c 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -1,31 +1,31 @@
 (.module:
   [library
-   [lux {"-" [Module type]}
+   [lux {"-" Module type}
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["<>" parser
-      ["<[0]>" code {"+" [Parser]}]]]
+      ["<[0]>" code {"+" Parser}]]]
     [data
      ["[0]" text]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" dictionary {"+" Dictionary}]
+      ["[0]" set {"+" Set}]]]
     [tool
      [compiler
       [meta
        [archive
-        [descriptor {"+" [Module]}]]]]]
+        [descriptor {"+" Module}]]]]]
     [world
-     [net {"+" [URL]}]]]]
+     [net {"+" URL}]]]]
   ["[0]" // "_"
    ["/" profile]
-   ["[1][0]" runtime {"+" [Runtime]}]
-   ["[1][0]" project {"+" [Project]}]
+   ["[1][0]" runtime {"+" Runtime}]
+   ["[1][0]" project {"+" Project}]
    ["[1][0]" dependency]
    ["[1][0]" repository "_"
     ["[1]" remote]]
-   ["[1][0]" artifact {"+" [Artifact]}
+   ["[1][0]" artifact {"+" Artifact}
     ["[1]/[0]" type]]])
 
 (def: (as_input input)
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index 226de3015..8ac9e1808 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -2,19 +2,19 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     [pipe {"+" [case>]}]
+     [pipe {"+" case>}]
      ["[0]" maybe ("[1]#[0]" functor)]
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      ["[0]" exception]
      ["<>" parser
-      ["<[0]>" xml {"+" [Parser]}]]]
+      ["<[0]>" xml {"+" Parser}]]]
     [data
      ["[0]" name]
      ["[0]" text]
      [format
-      ["_" xml {"+" [Tag XML]}]]
+      ["_" xml {"+" Tag XML}]]
      [collection
       ["[0]" list ("[1]#[0]" monoid functor mix)]
       ["[0]" set]
@@ -23,10 +23,10 @@
      ["[0]" file]]]]
   ["[0]" // "_"
    ["/" profile]
-   ["[1][0]" dependency {"+" [Dependency]}]
+   ["[1][0]" dependency {"+" Dependency}]
    [repository
-    [remote {"+" [Address]}]]
-   ["[1][0]" artifact {"+" [Artifact]}
+    [remote {"+" Address}]]
+   ["[1][0]" artifact {"+" Artifact}
     ["[1]/[0]" type]]])
 
 ... https://maven.apache.org/pom.html
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 3a81f1271..20347b27a 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -1,36 +1,36 @@
 (.module:
   [library
-   [lux {"-" [Info Source Module Name]}
+   [lux {"-" Info Source Module Name}
     [abstract
-     [monoid {"+" [Monoid]}]
-     [equivalence {"+" [Equivalence]}]]
+     [monoid {"+" Monoid}]
+     [equivalence {"+" Equivalence}]]
     [control
      ["[0]" maybe ("[1]#[0]" monoid)]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" product]
      ["[0]" text ("[1]#[0]" equivalence)]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
+      ["[0]" dictionary {"+" Dictionary}]
       ["[0]" list ("[1]#[0]" monoid)]
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [macro
      ["[0]" template]]
     [world
-     [net {"+" [URL]}]
-     [file {"+" [Path]}]]
+     [net {"+" URL}]
+     [file {"+" Path}]]
     [tool
      [compiler
       [meta
        [archive
-        [descriptor {"+" [Module]}]]]]]]]
+        [descriptor {"+" Module}]]]]]]]
   [//
-   ["[0]" runtime {"+" [Runtime]} ("[1]#[0]" equivalence)]
-   ["[0]" dependency {"+" [Dependency]} ("[1]#[0]" equivalence)]
-   ["[0]" artifact {"+" [Artifact]}
+   ["[0]" runtime {"+" Runtime} ("[1]#[0]" equivalence)]
+   ["[0]" dependency {"+" Dependency} ("[1]#[0]" equivalence)]
+   ["[0]" artifact {"+" Artifact}
     ["[0]" type]]
    [repository
-    [remote {"+" [Address]}]]])
+    [remote {"+" Address}]]])
 
 (def: .public default_compiler
   Dependency
diff --git a/stdlib/source/program/aedifex/project.lux b/stdlib/source/program/aedifex/project.lux
index 01173dba5..9649a8ad8 100644
--- a/stdlib/source/program/aedifex/project.lux
+++ b/stdlib/source/program/aedifex/project.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux {"-" [Name]}
+   [lux {"-" Name}
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monoid {"+" [Monoid]}]
-     ["[0]" monad {"+" [do]}]]
+     [equivalence {"+" Equivalence}]
+     [monoid {"+" Monoid}]
+     ["[0]" monad {"+" do}]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" dictionary {"+" [Dictionary]}]
-      ["[0]" set {"+" [Set]}]
+      ["[0]" dictionary {"+" Dictionary}]
+      ["[0]" set {"+" Set}]
       ["[0]" list ("[1]#[0]" mix)]]]]]
   ["[0]" // "_"
-   ["[1]" profile {"+" [Name Profile]}]])
+   ["[1]" profile {"+" Name Profile}]])
 
 (def: .public file
   "project.lux")
diff --git a/stdlib/source/program/aedifex/repository.lux b/stdlib/source/program/aedifex/repository.lux
index 8aefc9dc6..0ea5d685e 100644
--- a/stdlib/source/program/aedifex/repository.lux
+++ b/stdlib/source/program/aedifex/repository.lux
@@ -2,18 +2,18 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     [io {"+" [IO]}]
-     ["[0]" try {"+" [Try]}]
+     [io {"+" IO}]
+     ["[0]" try {"+" Try}]
      [concurrency
-      ["[0]" async {"+" [Async]}]
+      ["[0]" async {"+" Async}]
       ["[0]" stm]]]
     [data
-     [binary {"+" [Binary]}]]
+     [binary {"+" Binary}]]
     [world
      [net
-      [uri {"+" [URI]}]]]]])
+      [uri {"+" URI}]]]]])
 
 (type: .public (Repository !)
   (Interface
diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux
index 39a614880..ad4be2d54 100644
--- a/stdlib/source/program/aedifex/repository/identity.lux
+++ b/stdlib/source/program/aedifex/repository/identity.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
    [lux "*"
-    ["[0]" ffi {"+" [import:]}]
+    ["[0]" ffi {"+" import:}]
     [abstract
-     [equivalence {"+" [Equivalence]}]]
+     [equivalence {"+" Equivalence}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]]]]])
 
diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux
index 5af09ac99..517c7db89 100644
--- a/stdlib/source/program/aedifex/repository/local.lux
+++ b/stdlib/source/program/aedifex/repository/local.lux
@@ -2,19 +2,19 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try]
      [concurrency
-      ["[0]" async {"+" [Async]}]]]
+      ["[0]" async {"+" Async}]]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [world
-     [program {"+" [Program]}]
+     [program {"+" Program}]
      ["[0]" file]
      [net
-      ["[0]" uri {"+" [URI]}]]]]]
+      ["[0]" uri {"+" URI}]]]]]
   ["[0]" //
    ["/[1]" // "_"
     ["[1][0]" local]
diff --git a/stdlib/source/program/aedifex/repository/origin.lux b/stdlib/source/program/aedifex/repository/origin.lux
index a5a613a1a..319091936 100644
--- a/stdlib/source/program/aedifex/repository/origin.lux
+++ b/stdlib/source/program/aedifex/repository/origin.lux
@@ -2,13 +2,13 @@
   [library
    [lux "*"
     [abstract
-     [equivalence {"+" [Equivalence]}]]
+     [equivalence {"+" Equivalence}]]
     [data
      ["[0]" sum]
      ["[0]" text]]
     [world
-     [file {"+" [Path]}]
-     [net {"+" [URL]}]]]])
+     [file {"+" Path}]
+     [net {"+" URL}]]]])
 
 (type: .public Origin
   (Variant
diff --git a/stdlib/source/program/aedifex/repository/remote.lux b/stdlib/source/program/aedifex/repository/remote.lux
index d314cfa39..932a87092 100644
--- a/stdlib/source/program/aedifex/repository/remote.lux
+++ b/stdlib/source/program/aedifex/repository/remote.lux
@@ -2,15 +2,15 @@
   [library
    [lux "*"
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
-     ["[0]" io {"+" [IO]}]
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [exception:]}]]
+     ["[0]" io {"+" IO}]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" exception:}]]
     [data
      ["[0]" product]
      [text
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [tool
      [compiler
       ["[0]" version]
@@ -18,17 +18,17 @@
        ["[1]/[0]" lux "_"
         ["[1]" version]]]]]
     [world
-     [net {"+" [URL]}
-      [uri {"+" [URI]}]
+     [net {"+" URL}
+      [uri {"+" URI}]
       ["[0]" http "_"
        ["[1]" client]
        ["[1]/[0]" status]
        ["@[1]" /]]]]]]
   ["[0]" //
-   ["[1][0]" identity {"+" [Identity]}]
+   ["[1][0]" identity {"+" Identity}]
    ["/[1]" // "_"
-    ["[1][0]" artifact {"+" [Version Artifact]}
-     [extension {"+" [Extension]}]]]])
+    ["[1][0]" artifact {"+" Version Artifact}
+     [extension {"+" Extension}]]]])
 
 (type: .public Address
   URL)
diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux
index 6c90e4b73..d3cb3acb3 100644
--- a/stdlib/source/program/aedifex/runtime.lux
+++ b/stdlib/source/program/aedifex/runtime.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux {"-" [for]}
+   [lux {"-" for}
     [abstract
-     [equivalence {"+" [Equivalence]}]]
+     [equivalence {"+" Equivalence}]]
     [data
      ["[0]" product]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" monoid)]]]
     [macro