From fc8bebd3b3c5f050ea92e72eecbd9f6df09f28db Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Sat, 4 Sep 2021 12:49:52 -0400
Subject: De-taggification | part 2

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

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

diff --git a/stdlib/source/program/aedifex/action.lux b/stdlib/source/program/aedifex/action.lux
index 41d168b97..35024a755 100644
--- a/stdlib/source/program/aedifex/action.lux
+++ b/stdlib/source/program/aedifex/action.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ Monad)]]
+     [monad {"+" [Monad]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]]])
+      ["." 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 a6f506032..1f1261436 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
      ["." product]
      ["." text ("#\." order)
-      ["%" format (#+ Format)]]
+      ["%" format {"+" [Format]}]]
      [collection
       ["." list ("#\." monoid)]]]
     [world
-     ["." file (#+ Path)]
+     ["." file {"+" [Path]}]
      [net
-      ["." uri (#+ URI)]]]]])
+      ["." 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 130dda74e..6b3a61367 100644
--- a/stdlib/source/program/aedifex/artifact/extension.lux
+++ b/stdlib/source/program/aedifex/artifact/extension.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux (#- type)
+   [lux {"-" [type]}
     [data
      ["." text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [macro
      ["." template]]]]
-  ["." // #_
+  ["." // "_"
    ["#" type]])
 
 (type: .public Extension
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index 936419788..a83905f0b 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
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      ["." sum]
      [format
-      ["." xml (#+ XML)]]]]]
-  ["." / #_
-   ["#." stamp (#+ Stamp)]])
+      ["." xml {"+" [XML]}]]]]]
+  ["." / "_"
+   ["#." 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 15d0c91dd..3afdf31b1 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/build.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      [text
       ["%" format]]
      [format
-      ["." xml (#+ XML)]]]
+      ["." xml {"+" [XML]}]]]
     [math
      [number
       ["." nat]]]]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index 91fcc3de5..8d57034ef 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -1,20 +1,20 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      ["." product]
      [format
-      ["." xml (#+ XML)]]]]]
-  ["." // #_
-   ["#." time (#+ Time)]
-   ["#." build (#+ Build)]])
+      ["." xml {"+" [XML]}]]]]]
+  ["." // "_"
+   ["#." time {"+" [Time]}]
+   ["#." 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 703354eb8..ab62308b2 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/time.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
-     ["." exception (#+ exception:)]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
       ["<.>" text]
-      ["<.>" xml (#+ Parser)]]]
+      ["<.>" xml {"+" [Parser]}]]]
     [data
      [text
       ["%" format]]
      [format
-      ["." xml (#+ XML)]]]
+      ["." xml {"+" [XML]}]]]
     [time
-     ["." instant (#+ Instant)]]]]
-  ["." /// #_
+     ["." instant {"+" [Instant]}]]]]
+  ["." /// "_"
    ["#." time
     ["#/." date]
     ["#/." time]]])
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index 821d3d2c5..ff3017838 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
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      ["." product]
      ["." text]
      [format
-      ["." xml (#+ XML)]]]]]
-  ["." /// #_
-   ["#." type (#+ Type)]
-   ["#." time (#+ Time)]])
+      ["." xml {"+" [XML]}]]]]]
+  ["." /// "_"
+   ["#." type {"+" [Type]}]
+   ["#." 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 9aacdf6de..eff775ab3 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
      ["." product]
      ["." text
       ["%" format]]]]]
-  ["." /// (#+ Snapshot)
+  ["." /// {"+" [Snapshot]}
    ["#." time]
    ["#." stamp]])
 
diff --git a/stdlib/source/program/aedifex/artifact/time.lux b/stdlib/source/program/aedifex/artifact/time.lux
index 4a0a20ea3..d46d204bc 100644
--- a/stdlib/source/program/aedifex/artifact/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     ["." time]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      ["<>" parser
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" text {"+" [Parser]}]]]
     [data
      ["." product]
      [text
-      ["%" format (#+ Format)]]]
+      ["%" format {"+" [Format]}]]]
     [time
-     ["." instant (#+ Instant)]]]]
-  ["." / #_
+     ["." instant {"+" [Instant]}]]]]
+  ["." / "_"
    ["#." date]
    ["#." time]])
 
diff --git a/stdlib/source/program/aedifex/artifact/time/date.lux b/stdlib/source/program/aedifex/artifact/time/date.lux
index ca309e382..deb9cb8ed 100644
--- a/stdlib/source/program/aedifex/artifact/time/date.lux
+++ b/stdlib/source/program/aedifex/artifact/time/date.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]
-     [equivalence (#+ Equivalence)]]
+     [monad {"+" [do]}]
+     [equivalence {"+" [Equivalence]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" 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 6fb329962..5fca26062 100644
--- a/stdlib/source/program/aedifex/artifact/time/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time/time.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     ["." time]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["<>" parser
-      ["<.>" text (#+ Parser)]]]
+      ["<.>" text {"+" [Parser]}]]]
     [data
      [text
       ["%" format]]]
     [math
      [number
       ["n" nat]]]]]
-  ["." // #_
+  ["." // "_"
    ["#" date]])
 
 (type: .public Time
diff --git a/stdlib/source/program/aedifex/artifact/type.lux b/stdlib/source/program/aedifex/artifact/type.lux
index ae6f9b79b..659155f49 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 550ae86a3..d2d702236 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -1,33 +1,33 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
-     ["." exception (#+ exception:)]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]]
     [data
      ["." product]
      ["." text
       ["%" format]]
      [format
-      ["." xml (#+ XML)]]
+      ["." xml {"+" [XML]}]]
      [collection
       ["." list ("#\." functor)]]]
     [math
      [number
       ["n" nat]]]
-    ["." time (#+ Time)
-     ["." date (#+ Date)]
+    ["." time {"+" [Time]}
+     ["." date {"+" [Date]}]
      ["." year]
      ["." month]]]]
-  ["." // #_
+  ["." // "_"
    ["#." time]
-   ["#." snapshot (#+ Snapshot)
-    ["#/." version (#+ Version)]]])
+   ["#." snapshot {"+" [Snapshot]}
+    ["#/." version {"+" [Version]}]]])
 
 (type: .public Versioning
   (Record
diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux
index b51a0d1f1..6c93fa3cc 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
-      ["." cli (#+ Parser)]]]
+      ["." cli {"+" [Parser]}]]]
     [data
      ["." sum]
      ["." product]
      ["." 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 f918733c1..b0b900e05 100644
--- a/stdlib/source/program/aedifex/command.lux
+++ b/stdlib/source/program/aedifex/command.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*]]
-  ["." // #_
+   [lux "*"]]
+  ["." // "_"
    ["#" profile]
-   ["#." action (#+ Action)]])
+   ["#." 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 a4f6e0fca..4e2fd064c 100644
--- a/stdlib/source/program/aedifex/command/auto.lux
+++ b/stdlib/source/program/aedifex/command/auto.lux
@@ -1,29 +1,29 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      [collection
       ["." list]
       ["." set]]]
     [world
-     [program (#+ Program)]
-     [shell (#+ Exit Shell)]
-     [console (#+ Console)]
+     [program {"+" [Program]}]
+     [shell {"+" [Exit Shell]}]
+     [console {"+" [Console]}]
      ["." file
-      ["." watch (#+ Watcher)]]]]]
-  ["." // #_
-   ["/#" // #_
-    [command (#+ Command)]
+      ["." watch {"+" [Watcher]}]]]]]
+  ["." // "_"
+   ["/#" // "_"
+    [command {"+" [Command]}]
     ["#" profile]
     ["#." 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 bcda2401b..fea5ab74a 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)
-    ["." ffi (#+ import:)]
+   [lux {"-" [Name]}
+    ["." ffi {"+" [import:]}]
     [abstract
-     [order (#+ Order)]
-     [monad (#+ do)]]
+     [order {"+" [Order]}]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]
-     ["." io (#+ IO)]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]
+     ["." io {"+" [IO]}]
      [concurrency
-      ["." async (#+ Async) ("#\." monad)]]]
+      ["." async {"+" [Async]} ("#\." monad)]]]
     [data
      ["." product]
      ["." text ("#\." order)
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." functor mix)]
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." set]]]
     [math
      [number
       ["n" nat]
       ["i" int]]]
     [world
-     ["." program (#+ Program)]
-     ["." file (#+ Path)]
-     ["." shell (#+ Exit Process Shell)]
-     ["." console (#+ Console)]
+     ["." program {"+" [Program]}]
+     ["." file {"+" [Path]}]
+     ["." shell {"+" [Exit Process Shell]}]
+     ["." console {"+" [Console]}]
      [net
       ["." uri]]]]]
-  ["." /// #_
+  ["." /// "_"
    ["#" profile]
    ["#." action]
-   ["#." command (#+ Command)]
+   ["#." command {"+" [Command]}]
    ["#." local]
    ["#." repository]
    ["#." runtime]
-   ["#." dependency (#+ Dependency)
-    ["#/." resolution (#+ Resolution)]]
-   ["#." artifact (#+ Group Name Version Artifact)
+   ["#." dependency {"+" [Dependency]}
+    ["#/." resolution {"+" [Resolution]}]]
+   ["#." artifact {"+" [Group Name Version Artifact]}
     ["#/." type]]])
 
 (type: Finder
diff --git a/stdlib/source/program/aedifex/command/clean.lux b/stdlib/source/program/aedifex/command/clean.lux
index 5ff16928f..c5599e15e 100644
--- a/stdlib/source/program/aedifex/command/clean.lux
+++ b/stdlib/source/program/aedifex/command/clean.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     ["." monad (#+ do)]]
+     ["." monad {"+" [do]}]]
     [control
-     [try (#+ Try)]
+     [try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      [text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [world
-     ["." file (#+ Path)]
-     ["." console (#+ Console)]]]]
-  ["." /// #_
-   [command (#+ Command)]
+     ["." file {"+" [Path]}]
+     ["." console {"+" [Console]}]]]]
+  ["." /// "_"
+   [command {"+" [Command]}]
    ["#" profile]
-   ["#." action (#+ Action)]])
+   ["#." 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 01e083faf..787496543 100644
--- a/stdlib/source/program/aedifex/command/deploy.lux
+++ b/stdlib/source/program/aedifex/command/deploy.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     [pipe (#+ do>)]
-     ["." try (#+ Try)]
+     [pipe {"+" [do>]}]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async) ("#\." monad)]]
+      ["." async {"+" [Async]} ("#\." monad)]]
      ["<>" parser
       ["<.>" xml]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      [text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [collection
@@ -23,34 +23,34 @@
       ["." tar]
       ["." xml]]]
     [time
-     ["." instant (#+ Instant)]]
+     ["." instant {"+" [Instant]}]]
     [world
      ["." file]
-     ["." console (#+ Console)]]]]
+     ["." console {"+" [Console]}]]]]
   [program
    [compositor
     ["." export]]]
-  ["." // #_
+  ["." // "_"
    ["#." clean]
-   ["/#" // #_
-    [command (#+ Command)]
+   ["/#" // "_"
+    [command {"+" [Command]}]
     ["/" profile]
-    ["#." action (#+ Action)]
+    ["#." action {"+" [Action]}]
     ["#." pom]
     ["#." hash]
     ["#." package]
     ["#." dependency
      ["#/." deployment]
-     ["#/." status (#+ Status)]]
-    ["#." repository (#+ Repository)
-     [identity (#+ Identity)]
+     ["#/." status {"+" [Status]}]]
+    ["#." repository {"+" [Repository]}
+     [identity {"+" [Identity]}]
      ["#/." remote]
      ["#/." origin]]
     ["#." metadata
      ["#/." artifact]
      ["#/." snapshot]]
-    ["#." artifact (#+ Artifact)
-     ["#/." extension (#+ Extension)]
+    ["#." artifact {"+" [Artifact]}
+     ["#/." extension {"+" [Extension]}]
      ["#/." type]]]])
 
 (def: .public success
diff --git a/stdlib/source/program/aedifex/command/deps.lux b/stdlib/source/program/aedifex/command/deps.lux
index c1b0990f5..a5c27f5ac 100644
--- a/stdlib/source/program/aedifex/command/deps.lux
+++ b/stdlib/source/program/aedifex/command/deps.lux
@@ -1,34 +1,34 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." exception]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      [collection
-      ["." set (#+ Set)]
+      ["." set {"+" [Set]}]
       ["." list ("#\." mix)]
       ["." dictionary]]
      [text
       ["%" format]]]
     [world
-     [net (#+ URL)]
-     [program (#+ Program)]
+     [net {"+" [URL]}]
+     [program {"+" [Program]}]
      ["." file]
-     ["." console (#+ Console)]]]]
-  ["." // #_
+     ["." console {"+" [Console]}]]]]
+  ["." // "_"
    ["#." clean]
-   ["/#" // #_
-    [command (#+ Command)]
-    [repository (#+ Repository)]
+   ["/#" // "_"
+    [command {"+" [Command]}]
+    [repository {"+" [Repository]}]
     ["#" profile]
-    ["#." action (#+ Action)]
-    ["#." artifact (#+ Artifact)]
-    ["#." dependency (#+ Dependency)
-     ["#/." resolution (#+ Resolution)]
+    ["#." action {"+" [Action]}]
+    ["#." artifact {"+" [Artifact]}]
+    ["#." dependency {"+" [Dependency]}
+     ["#/." resolution {"+" [Resolution]}]
      ["#/." deployment]]]])
 
 (def: format
diff --git a/stdlib/source/program/aedifex/command/install.lux b/stdlib/source/program/aedifex/command/install.lux
index a496b35bc..023b2cc84 100644
--- a/stdlib/source/program/aedifex/command/install.lux
+++ b/stdlib/source/program/aedifex/command/install.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      ["." exception]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      [text
       [encoding
        ["." utf8]]]
@@ -20,27 +20,27 @@
       ["." tar]
       ["." xml]]]
     [world
-     [program (#+ Program)]
+     [program {"+" [Program]}]
      ["." file]
-     ["." console (#+ Console)]]]]
+     ["." console {"+" [Console]}]]]]
   [program
    [compositor
     ["." export]]]
-  ["." // #_
+  ["." // "_"
    ["#." clean]
-   ["/#" // #_
-    ["/" profile (#+ Profile)]
-    ["#." action (#+ Action)]
-    ["#." command (#+ Command)]
+   ["/#" // "_"
+    ["/" profile {"+" [Profile]}]
+    ["#." action {"+" [Action]}]
+    ["#." command {"+" [Command]}]
     ["#." local]
     ["#." pom]
     ["#." package]
-    [repository (#+ Repository)
+    [repository {"+" [Repository]}
      ["#." origin]]
-    ["#." dependency #_
+    ["#." dependency "_"
      ["#/." deployment]
      ["#/." status]]
-    ["#." artifact (#+ Artifact)
+    ["#." artifact {"+" [Artifact]}
      ["#/." type]]]])
 
 (def: .public success
diff --git a/stdlib/source/program/aedifex/command/pom.lux b/stdlib/source/program/aedifex/command/pom.lux
index 9c449a0b9..fed4f8771 100644
--- a/stdlib/source/program/aedifex/command/pom.lux
+++ b/stdlib/source/program/aedifex/command/pom.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try ("#\." functor)]
      [concurrency
-      ["." async (#+ Async) ("#\." monad)]]]
+      ["." async {"+" [Async]} ("#\." monad)]]]
     [data
      [text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [format
       ["." xml]]]
     [world
      ["." file]
-     ["." console (#+ Console)]]]]
-  ["." /// #_
-   [command (#+ Command)]
+     ["." console {"+" [Console]}]]]]
+  ["." /// "_"
+   [command {"+" [Command]}]
    ["#." action]
    ["#." pom]])
 
diff --git a/stdlib/source/program/aedifex/command/test.lux b/stdlib/source/program/aedifex/command/test.lux
index ae627bcb7..822cc874b 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
-      ["." async (#+ Async) ("#\." monad)]]]
+      ["." async {"+" [Async]} ("#\." monad)]]]
     [math
      [number
       ["i" int]]]
     [world
-     ["." program (#+ Program)]
+     ["." program {"+" [Program]}]
      ["." file]
-     ["." shell (#+ Exit Shell)]
-     ["." console (#+ Console)]]]]
-  ["." // #_
+     ["." shell {"+" [Exit Shell]}]
+     ["." console {"+" [Console]}]]]]
+  ["." // "_"
    ["#." build]
-   ["/#" // #_
+   ["/#" // "_"
     ["#" profile]
     ["#." action]
-    ["#." command (#+ Command)]
+    ["#." command {"+" [Command]}]
     ["#." 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 d66738f11..640277699 100644
--- a/stdlib/source/program/aedifex/command/version.lux
+++ b/stdlib/source/program/aedifex/command/version.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [control
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [tool
      [compiler
       ["." version]
-      ["." language #_
-       ["#/." lux #_
+      ["." language "_"
+       ["#/." lux "_"
         ["#" version]]]]]
     [world
-     ["." console (#+ Console)]]]]
+     ["." 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 b1e1ed875..bb75342c1 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
      ["." product]
      ["." text ("#\." order)
-      ["%" format (#+ format)]]]]]
-  ["." // #_
-   ["#" artifact (#+ Artifact) ("#\." order)
-    [type (#+ Type)]]])
+      ["%" format {"+" [format]}]]]]]
+  ["." // "_"
+   ["#" artifact {"+" [Artifact]} ("#\." 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 d63c5a0a2..5abc9979a 100644
--- a/stdlib/source/program/aedifex/dependency/deployment.lux
+++ b/stdlib/source/program/aedifex/dependency/deployment.lux
@@ -1,44 +1,44 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [codec (#+ Codec)]
-     ["." monad (#+ do)]]
+     [codec {"+" [Codec]}]
+     ["." monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." product]
      [text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [collection
       ["." dictionary]
-      ["." set (#+ Set)]
+      ["." set {"+" [Set]}]
       ["." list ("#\." monoid)]]]
     [time
-     ["." instant (#+ Instant)]]]]
-  ["." /// #_
-   [repository (#+ Repository)]
-   ["#." hash (#+ Hash)]
-   ["#." package (#+ Package)]
-   ["#." artifact (#+ Artifact)
+     ["." instant {"+" [Instant]}]]]]
+  ["." /// "_"
+   [repository {"+" [Repository]}]
+   ["#." hash {"+" [Hash]}]
+   ["#." package {"+" [Package]}]
+   ["#." artifact {"+" [Artifact]}
     ["#/." time]
     ["#/." type]
-    ["#/." extension (#+ Extension)]
+    ["#/." extension {"+" [Extension]}]
     ["#/." versioning]
     ["#/." snapshot
      ["#/." version
       ["#/." value]]]]
-   ["#." metadata #_
+   ["#." metadata "_"
     ["#/." artifact]
-    ["#/." snapshot (#+ Metadata)]]
-   ["#." dependency (#+ Dependency)
-    [resolution (#+ Resolution)]
-    ["#/." status (#+ Status)]]])
+    ["#/." snapshot {"+" [Metadata]}]]
+   ["#." dependency {"+" [Dependency]}
+    [resolution {"+" [Resolution]}]
+    ["#/." 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 20f4cff71..99e8b9adf 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]
     ["." debug]
-    ["." ffi (#+ import:)]
+    ["." ffi {"+" [import:]}]
     [abstract
-     [codec (#+ Codec)]
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]
-     ["." predicate (#+ Predicate)]]
+     [codec {"+" [Codec]}]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]
+     ["." predicate {"+" [Predicate]}]]
     [control
      ["." maybe]
-     ["." try (#+ Try) ("#\." functor)]
-     ["." exception (#+ Exception exception:)]
+     ["." try {"+" [Try]} ("#\." functor)]
+     ["." exception {"+" [Exception exception:]}]
      ["<>" parser
-      ["<.>" xml (#+ Parser)]]
+      ["<.>" xml {"+" [Parser]}]]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
-     ["." binary (#+ Binary)]
+     ["." binary {"+" [Binary]}]
      ["." name]
      ["." text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]
      [format
-      ["." xml (#+ Tag XML)]]
+      ["." xml {"+" [Tag XML]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." set]
       ["." list ("#\." functor monoid)]]]
     [math
@@ -35,27 +35,27 @@
       ["n" nat]
       ["." i64]]]
     [world
-     [console (#+ Console)]
-     [net (#+ URL)
+     [console {"+" [Console]}]
+     [net {"+" [URL]}
       ["." uri]
-      ["." http #_
+      ["." http "_"
        ["#" client]]]]]]
-  ["." // (#+ Dependency)
-   ["#." status (#+ Status)]
-   ["/#" // #_
+  ["." // {"+" [Dependency]}
+   ["#." status {"+" [Status]}]
+   ["/#" // "_"
     ["/" profile]
-    ["#." hash (#+ Hash SHA-1 MD5)]
+    ["#." hash {"+" [Hash SHA-1 MD5]}]
     ["#." pom]
-    ["#." package (#+ Package)]
-    ["#." artifact (#+ Version Artifact)
-     ["#/." extension (#+ Extension)]
+    ["#." package {"+" [Package]}]
+    ["#." artifact {"+" [Version Artifact]}
+     ["#/." extension {"+" [Extension]}]
      ["#/." versioning]
      ["." snapshot
       [version
        ["." value]]]]
-    ["#." repository (#+ Repository)
-     ["#/." remote (#+ Address)]
-     ["#/." origin (#+ Origin)]]
+    ["#." repository {"+" [Repository]}
+     ["#/." remote {"+" [Address]}]
+     ["#/." origin {"+" [Origin]}]]
     ["#." metadata
      ["#/." snapshot]]]])
 
diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux
index eac5c9fd0..8d5f8ecc4 100644
--- a/stdlib/source/program/aedifex/dependency/status.lux
+++ b/stdlib/source/program/aedifex/dependency/status.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." sum]
      ["." product]]]]
-  ["." /// #_
-   ["#." hash (#+ Hash SHA-1 MD5)]])
+  ["." /// "_"
+   ["#." 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 93eca461f..af03bf827 100644
--- a/stdlib/source/program/aedifex/format.lux
+++ b/stdlib/source/program/aedifex/format.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text ("#\." equivalence)]
      [collection
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." list ("#\." monad)]
-      ["." set (#+ Set)]]]
+      ["." set {"+" [Set]}]]]
     [macro
      ["." code]
      ["." template]]]]
-  ["." // #_
+  ["." // "_"
    ["/" profile]
-   ["#." runtime (#+ Runtime)]
-   ["#." project (#+ Project)]
-   ["#." dependency (#+ Dependency)]
-   ["#." artifact (#+ Artifact)
+   ["#." runtime {"+" [Runtime]}]
+   ["#." project {"+" [Project]}]
+   ["#." dependency {"+" [Dependency]}]
+   ["#." artifact {"+" [Artifact]}
     ["#/." type]]])
 
 (type: .public (Format a)
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index d0dde1c65..13ee22b41 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux #*
-    ["." ffi (#+ import:)]
+   [lux "*"
+    ["." ffi {"+" [import:]}]
     [abstract
-     [codec (#+ Codec)]
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [codec {"+" [Codec]}]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]]
     [data
-     ["." binary (#+ Binary)]
+     ["." binary {"+" [Binary]}]
      ["." text
-      ["%" format (#+ Format format)]
+      ["%" format {"+" [Format format]}]
       ["." encoding]]]
     [math
      [number
diff --git a/stdlib/source/program/aedifex/input.lux b/stdlib/source/program/aedifex/input.lux
index 08f309968..0305e30d8 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
-     ["." monad (#+ Monad do)]
+     ["." monad {"+" [Monad do]}]
      ["." mix]]
     [control
-     [pipe (#+ do>)]
-     ["." try (#+ Try)]
+     [pipe {"+" [do>]}]
+     ["." try {"+" [Try]}]
      [parser
       ["<.>" code]]]
     [data
-     [binary (#+ Binary)]
+     [binary {"+" [Binary]}]
      ["." text
       [encoding
        ["." utf8]]]
@@ -25,9 +25,9 @@
         ["." syntax]]]]]
     [world
      ["." file]]]]
-  ["." // #_
-   ["#." profile (#+ Name Profile)]
-   ["#." project (#+ Project)]
+  ["." // "_"
+   ["#." profile {"+" [Name Profile]}]
+   ["#." project {"+" [Project]}]
    ["#." parser]])
 
 (def: (lux_parser source_code)
diff --git a/stdlib/source/program/aedifex/local.lux b/stdlib/source/program/aedifex/local.lux
index 021ce9ca7..4fec9c339 100644
--- a/stdlib/source/program/aedifex/local.lux
+++ b/stdlib/source/program/aedifex/local.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      [text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [world
      [net
-      ["." uri (#+ URI)]]]]]
-  ["." // #_
-   ["#." artifact (#+ Version Artifact)]])
+      ["." uri {"+" [URI]}]]]]]
+  ["." // "_"
+   ["#." artifact {"+" [Version Artifact]}]])
 
 (def: / uri.separator)
 
diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux
index c8bad9fed..652aab29d 100644
--- a/stdlib/source/program/aedifex/metadata.lux
+++ b/stdlib/source/program/aedifex/metadata.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [data
      ["." text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [world
-     [file (#+ Path)]
+     [file {"+" [Path]}]
      [net
-      ["." uri (#+ URI)]]]]]
-  ["." // #_
-   ["#." artifact (#+ Artifact)]])
+      ["." uri {"+" [URI]}]]]]]
+  ["." // "_"
+   ["#." 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 0d6b924b9..dc54c8e2d 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>)]
-     ["." try (#+ Try)]
+     [pipe {"+" [do>]}]
+     ["." try {"+" [Try]}]
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." product]
      ["." text
@@ -19,24 +19,24 @@
       [encoding
        ["." utf8]]]
      [format
-      ["." xml (#+ XML)]]
+      ["." xml {"+" [XML]}]]
      [collection
       ["." list ("#\." functor)]]]
     [math
      [number
       ["n" nat]]]
-    ["." time (#+ Time)
-     ["." instant (#+ Instant)]
-     ["." date (#+ Date)]
+    ["." time {"+" [Time]}
+     ["." instant {"+" [Instant]}]
+     ["." date {"+" [Date]}]
      ["." year]
      ["." month]]
     [world
      [net
-      ["." uri (#+ URI)]]]]]
+      ["." uri {"+" [URI]}]]]]]
   ["." //
-   ["/#" // #_
-    [repository (#+ Repository)]
-    ["#." artifact (#+ Group Name Version Artifact)]]])
+   ["/#" // "_"
+    [repository {"+" [Repository]}]
+    ["#." 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 61183a932..79b9d66dc 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>)]
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]
+     [pipe {"+" [do> case>]}]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]
      ["<>" parser
-      ["<.>" xml (#+ Parser)]
+      ["<.>" xml {"+" [Parser]}]
       ["<.>" text]]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." product]
      ["." text
@@ -20,27 +20,27 @@
       [encoding
        ["." utf8]]]
      [format
-      ["." xml (#+ XML)]]
+      ["." xml {"+" [XML]}]]
      [collection
       ["." list ("#\." functor)]]]
     [math
      [number
       ["n" nat]]]
-    ["." time (#+ Time)
-     ["." instant (#+ Instant)]
-     ["." date (#+ Date)]
+    ["." time {"+" [Time]}
+     ["." instant {"+" [Instant]}]
+     ["." date {"+" [Date]}]
      ["." year]
      ["." month]]
     [world
      [net
-      ["." uri (#+ URI)]]]]]
+      ["." uri {"+" [URI]}]]]]]
   ["." //
-   ["/#" // #_
-    [repository (#+ Repository)]
-    ["#." artifact (#+ Group Name Version Artifact)
+   ["/#" // "_"
+    [repository {"+" [Repository]}]
+    ["#." artifact {"+" [Group Name Version Artifact]}
      ["#/." time]
-     ["#/." type (#+ Type)]
-     ["#/." versioning (#+ Versioning)]
+     ["#/." type {"+" [Type]}]
+     ["#/." versioning {"+" [Versioning]}]
      ["#/." snapshot
       ["#/." version]
       ["#/." stamp]]]]])
diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index 54994e50b..069bdb83c 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
-     ["." try (#+ Try) ("#\." functor)]
+     ["." try {"+" [Try]} ("#\." functor)]
      [parser
       ["<.>" xml]]]
     [data
      ["." sum]
      ["." product]
-     ["." binary (#+ Binary)]
+     ["." binary {"+" [Binary]}]
      [text
       [encoding
        ["." utf8]]]
      [format
-      ["." xml (#+ XML)]]
+      ["." xml {"+" [XML]}]]
      [collection
-      [set (#+ Set)]]]]]
-  ["." // #_
+      [set {"+" [Set]}]]]]]
+  ["." // "_"
    ["/" profile]
    ["#." hash]
    ["#." pom]
-   [dependency (#+ Dependency)
-    ["#." status (#+ Status)]]
+   [dependency {"+" [Dependency]}
+    ["#." status {"+" [Status]}]]
    [repository
-    [remote (#+ Address)]
-    ["#." origin (#+ Origin)]]])
+    [remote {"+" [Address]}]
+    ["#." origin {"+" [Origin]}]]])
 
 (type: .public Package
   (Record
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 41ada3cc7..0284d3ced 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
-      ["<.>" code (#+ Parser)]]]
+      ["<.>" code {"+" [Parser]}]]]
     [data
      ["." text]
      [collection
-      ["." dictionary (#+ Dictionary)]
-      ["." set (#+ Set)]]]
+      ["." dictionary {"+" [Dictionary]}]
+      ["." set {"+" [Set]}]]]
     [tool
      [compiler
       [meta
        [archive
-        [descriptor (#+ Module)]]]]]
+        [descriptor {"+" [Module]}]]]]]
     [world
-     [net (#+ URL)]]]]
-  ["." // #_
+     [net {"+" [URL]}]]]]
+  ["." // "_"
    ["/" profile]
-   ["#." runtime (#+ Runtime)]
-   ["#." project (#+ Project)]
+   ["#." runtime {"+" [Runtime]}]
+   ["#." project {"+" [Project]}]
    ["#." dependency]
-   ["#." repository #_
+   ["#." repository "_"
     ["#" remote]]
-   ["#." artifact (#+ Artifact)
+   ["#." artifact {"+" [Artifact]}
     ["#/." type]]])
 
 (def: (as_input input)
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index 99ac54571..b116e45bc 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -1,32 +1,32 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     [pipe (#+ case>)]
+     [pipe {"+" [case>]}]
      ["." maybe ("#\." functor)]
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      ["." exception]
      ["<>" parser
-      ["<.>" xml (#+ Parser)]]]
+      ["<.>" xml {"+" [Parser]}]]]
     [data
      ["." name]
      ["." text]
      [format
-      ["_" xml (#+ Tag XML)]]
+      ["_" xml {"+" [Tag XML]}]]
      [collection
       ["." list ("#\." monoid functor mix)]
       ["." set]
       ["." dictionary]]]
     [world
      ["." file]]]]
-  ["." // #_
+  ["." // "_"
    ["/" profile]
-   ["#." dependency (#+ Dependency)]
+   ["#." dependency {"+" [Dependency]}]
    [repository
-    [remote (#+ Address)]]
-   ["#." artifact (#+ Artifact)
+    [remote {"+" [Address]}]]
+   ["#." artifact {"+" [Artifact]}
     ["#/." type]]])
 
 ... https://maven.apache.org/pom.html
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 7621f0848..53c7075fb 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
      ["." maybe ("#\." monoid)]
-     ["." exception (#+ exception:)]]
+     ["." exception {"+" [exception:]}]]
     [data
      ["." product]
      ["." text ("#\." equivalence)]
      [collection
-      ["." dictionary (#+ Dictionary)]
+      ["." dictionary {"+" [Dictionary]}]
       ["." list ("#\." monoid)]
-      ["." set (#+ Set)]]]
+      ["." set {"+" [Set]}]]]
     [macro
      ["." template]]
     [world
-     [net (#+ URL)]
-     [file (#+ Path)]]
+     [net {"+" [URL]}]
+     [file {"+" [Path]}]]
     [tool
      [compiler
       [meta
        [archive
-        [descriptor (#+ Module)]]]]]]]
+        [descriptor {"+" [Module]}]]]]]]]
   [//
-   ["." runtime (#+ Runtime) ("#\." equivalence)]
-   ["." dependency (#+ Dependency) ("#\." equivalence)]
-   ["." artifact (#+ Artifact)
+   ["." runtime {"+" [Runtime]} ("#\." equivalence)]
+   ["." dependency {"+" [Dependency]} ("#\." equivalence)]
+   ["." artifact {"+" [Artifact]}
     ["." 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 581c899a7..a1c354cb9 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)]
-     ["." monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monoid {"+" [Monoid]}]
+     ["." monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]]
     [data
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
-      ["." dictionary (#+ Dictionary)]
-      ["." set (#+ Set)]
+      ["." dictionary {"+" [Dictionary]}]
+      ["." set {"+" [Set]}]
       ["." list ("#\." mix)]]]]]
-  ["." // #_
-   ["#" profile (#+ Name Profile)]])
+  ["." // "_"
+   ["#" 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 38fb27ead..50a473b82 100644
--- a/stdlib/source/program/aedifex/repository.lux
+++ b/stdlib/source/program/aedifex/repository.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     [io (#+ IO)]
-     ["." try (#+ Try)]
+     [io {"+" [IO]}]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]
+      ["." async {"+" [Async]}]
       ["." 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 c4b974664..06df89360 100644
--- a/stdlib/source/program/aedifex/repository/identity.lux
+++ b/stdlib/source/program/aedifex/repository/identity.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
-    ["." ffi (#+ import:)]
+   [lux "*"
+    ["." ffi {"+" [import:]}]
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
      ["." product]
      ["." text
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8]]]]]])
 
diff --git a/stdlib/source/program/aedifex/repository/local.lux b/stdlib/source/program/aedifex/repository/local.lux
index 907610233..d10296714 100644
--- a/stdlib/source/program/aedifex/repository/local.lux
+++ b/stdlib/source/program/aedifex/repository/local.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [world
-     [program (#+ Program)]
+     [program {"+" [Program]}]
      ["." file]
      [net
-      ["." uri (#+ URI)]]]]]
+      ["." uri {"+" [URI]}]]]]]
   ["." //
-   ["/#" // #_
+   ["/#" // "_"
     ["#." local]
     ["#." metadata]]])
 
diff --git a/stdlib/source/program/aedifex/repository/origin.lux b/stdlib/source/program/aedifex/repository/origin.lux
index 845592762..fdee108c5 100644
--- a/stdlib/source/program/aedifex/repository/origin.lux
+++ b/stdlib/source/program/aedifex/repository/origin.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [equivalence (#+ Equivalence)]]
+     [equivalence {"+" [Equivalence]}]]
     [data
      ["." sum]
      ["." 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 af9613db7..00ac66517 100644
--- a/stdlib/source/program/aedifex/repository/remote.lux
+++ b/stdlib/source/program/aedifex/repository/remote.lux
@@ -1,34 +1,34 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     ["." io (#+ IO)]
-     ["." try (#+ Try)]
-     ["." exception (#+ exception:)]]
+     ["." io {"+" [IO]}]
+     ["." try {"+" [Try]}]
+     ["." exception {"+" [exception:]}]]
     [data
      ["." product]
      [text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [tool
      [compiler
       ["." version]
-      ["." language #_
-       ["#/." lux #_
+      ["." language "_"
+       ["#/." lux "_"
         ["#" version]]]]]
     [world
-     [net (#+ URL)
-      [uri (#+ URI)]
-      ["." http #_
+     [net {"+" [URL]}
+      [uri {"+" [URI]}]
+      ["." http "_"
        ["#" client]
        ["#/." status]
        ["@#" /]]]]]]
   ["." //
-   ["#." identity (#+ Identity)]
-   ["/#" // #_
-    ["#." artifact (#+ Version Artifact)
-     [extension (#+ Extension)]]]])
+   ["#." identity {"+" [Identity]}]
+   ["/#" // "_"
+    ["#." 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 b5a9a78e0..3c8ec6485 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
      ["." product]
      ["." text
-      ["%" format (#+ format)]]
+      ["%" format {"+" [format]}]]
      [collection
       ["." list ("#\." monoid)]]]
     [macro
-- 
cgit v1.2.3