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/specification/aedifex/repository.lux | 16 ++++++++--------
 stdlib/source/specification/compositor.lux         | 22 +++++++++++-----------
 .../specification/compositor/analysis/type.lux     | 14 +++++++-------
 stdlib/source/specification/compositor/common.lux  | 18 +++++++++---------
 .../specification/compositor/generation/case.lux   | 18 +++++++++---------
 .../specification/compositor/generation/common.lux | 18 +++++++++---------
 .../compositor/generation/function.lux             | 20 ++++++++++----------
 .../compositor/generation/primitive.lux            | 12 ++++++------
 .../compositor/generation/reference.lux            | 12 ++++++------
 .../compositor/generation/structure.lux            | 16 ++++++++--------
 stdlib/source/specification/lux/abstract/apply.lux | 10 +++++-----
 stdlib/source/specification/lux/abstract/codec.lux | 10 +++++-----
 .../source/specification/lux/abstract/comonad.lux  | 10 +++++-----
 stdlib/source/specification/lux/abstract/enum.lux  |  8 ++++----
 .../specification/lux/abstract/equivalence.lux     | 10 +++++-----
 .../source/specification/lux/abstract/functor.lux  | 10 +++++-----
 .../lux/abstract/functor/contravariant.lux         | 10 +++++-----
 stdlib/source/specification/lux/abstract/hash.lux  |  8 ++++----
 .../source/specification/lux/abstract/interval.lux |  8 ++++----
 stdlib/source/specification/lux/abstract/mix.lux   |  8 ++++----
 stdlib/source/specification/lux/abstract/monad.lux |  8 ++++----
 .../source/specification/lux/abstract/monoid.lux   | 10 +++++-----
 stdlib/source/specification/lux/abstract/order.lux |  8 ++++----
 stdlib/source/specification/lux/world/console.lux  | 12 ++++++------
 stdlib/source/specification/lux/world/file.lux     | 18 +++++++++---------
 stdlib/source/specification/lux/world/program.lux  |  8 ++++----
 stdlib/source/specification/lux/world/shell.lux    | 14 +++++++-------
 27 files changed, 168 insertions(+), 168 deletions(-)

(limited to 'stdlib/source/specification')

diff --git a/stdlib/source/specification/aedifex/repository.lux b/stdlib/source/specification/aedifex/repository.lux
index 6a834a0a8..e08211d32 100644
--- a/stdlib/source/specification/aedifex/repository.lux
+++ b/stdlib/source/specification/aedifex/repository.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     ["." try (#+ Try)]
+     ["." try {"+" [Try]}]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." binary
       ["_#" \\test]]]
@@ -16,11 +16,11 @@
   [\\program
    ["." /
     ["#." remote]
-    ["/#" // #_
-     ["#." artifact (#+ Artifact)
+    ["/#" // "_"
+     ["#." artifact {"+" [Artifact]}
       ["#/." extension]]]]]
   [\\test
-   ["_." // #_
+   ["_." // "_"
     ["#." artifact]]])
 
 (def: .public (spec valid_artifact invalid_artifact subject)
diff --git a/stdlib/source/specification/compositor.lux b/stdlib/source/specification/compositor.lux
index 619ba5fa9..d8d1a718c 100644
--- a/stdlib/source/specification/compositor.lux
+++ b/stdlib/source/specification/compositor.lux
@@ -1,10 +1,10 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    ["." io (#+ IO)]
+    ["." io {"+" [IO]}]
     ["." try]]
    [math
     ["r" random]]
@@ -13,15 +13,15 @@
      ["." analysis]
      ["." directive]
      [phase
-      [macro (#+ Expander)]
-      [generation (#+ Bundle)]]
+      [macro {"+" [Expander]}]
+      [generation {"+" [Bundle]}]]
      [default
-      [platform (#+ Platform)]]]]]
-  ["." / #_
-   ["#." common (#+ Runner Definer)]
-   ["#./" analysis #_
+      [platform {"+" [Platform]}]]]]]
+  ["." / "_"
+   ["#." common {"+" [Runner Definer]}]
+   ["#./" analysis "_"
     ["#." type]]
-   ["#./" generation #_
+   ["#./" generation "_"
     ["#." primitive]
     ["#." structure]
     ["#." reference]
diff --git a/stdlib/source/specification/compositor/analysis/type.lux b/stdlib/source/specification/compositor/analysis/type.lux
index 662748677..2ad411da0 100644
--- a/stdlib/source/specification/compositor/analysis/type.lux
+++ b/stdlib/source/specification/compositor/analysis/type.lux
@@ -1,21 +1,21 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." io]
     ["." try]]
    [math
-    ["r" random (#+ Random)]]
+    ["r" random {"+" [Random]}]]
    [macro
     ["." code]]
    [tool
     [compiler
-     [analysis (#+ State+)]
+     [analysis {"+" [State+]}]
      ["." phase
-      [macro (#+ Expander)]
+      [macro {"+" [Expander]}]
       ["." analysis
        ["#/." scope]
        ["#/." type]]]]]])
diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux
index 72a27804d..bf1236b3f 100644
--- a/stdlib/source/specification/compositor/common.lux
+++ b/stdlib/source/specification/compositor/common.lux
@@ -1,23 +1,23 @@
 (.module:
-  [lux #*
+  [lux "*"
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    ["." io (#+ IO)]
-    ["." try (#+ Try)]]
+    ["." io {"+" [IO]}]
+    ["." try {"+" [Try]}]]
    [tool
     [compiler
      ["." reference]
      ["." analysis]
-     ["." synthesis (#+ Synthesis)]
+     ["." synthesis {"+" [Synthesis]}]
      ["." directive]
      ["." phase
-      ["." macro (#+ Expander)]
-      ["." generation (#+ Operation)]
-      [extension (#+ Extender)
+      ["." macro {"+" [Expander]}]
+      ["." generation {"+" [Operation]}]
+      [extension {"+" [Extender]}
        ["." bundle]]]
      [default
-      ["." platform (#+ Platform)]]]]])
+      ["." platform {"+" [Platform]}]]]]])
 
 (type: .public Runner
   (-> Text Synthesis (Try Any)))
diff --git a/stdlib/source/specification/compositor/generation/case.lux b/stdlib/source/specification/compositor/generation/case.lux
index d1d0074fd..c7c221eb7 100644
--- a/stdlib/source/specification/compositor/generation/case.lux
+++ b/stdlib/source/specification/compositor/generation/case.lux
@@ -1,32 +1,32 @@
 (.module:
-  [lux (#- case)
-   ["_" test (#+ Test)]
+  [lux {"-" [case]}
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try)]]
+    [pipe {"+" [case>]}]
+    ["." try {"+" [Try]}]]
    [data
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
+     ["%" format {"+" [format]}]]
     [number
      ["n" nat]
      ["f" frac]]
     [collection
      ["." list ("#\." mix)]]]
    [math
-    ["r" random (#+ Random)]]
+    ["r" random {"+" [Random]}]]
    [tool
     [compiler
      ["." reference]
      ["." analysis]
-     ["." synthesis (#+ Path Synthesis)]
+     ["." synthesis {"+" [Path Synthesis]}]
      ["." phase
       ["#/." synthesis
        ["." case]]
       ["." extension/synthesis]]]]]
   [///
-   [common (#+ Runner)]])
+   [common {"+" [Runner]}]])
 
 (def: limit Nat 10)
 
diff --git a/stdlib/source/specification/compositor/generation/common.lux b/stdlib/source/specification/compositor/generation/common.lux
index e9d8eae55..18d739d8e 100644
--- a/stdlib/source/specification/compositor/generation/common.lux
+++ b/stdlib/source/specification/compositor/generation/common.lux
@@ -1,11 +1,11 @@
 (.module:
-  [lux (#- i64)
-   ["_" test (#+ Test)]
+  [lux {"-" [i64]}
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
-    ["." try (#+ Try)]]
+    [pipe {"+" [case>]}]
+    ["." try {"+" [Try]}]]
    [data
     ["." bit ("#\." equivalence)]
     [number
@@ -14,19 +14,19 @@
      ["i" int]
      ["f" frac]]
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
+     ["%" format {"+" [format]}]]
     [collection
      ["." list]]]
    [math
-    ["r" random (#+ Random)]]
+    ["r" random {"+" [Random]}]]
    [tool
     [compiler
      ["." reference]
      ["." synthesis]]]]
-  ["." // #_
+  ["." // "_"
    ["#." case]
    [//
-    [common (#+ Runner)]]])
+    [common {"+" [Runner]}]]])
 
 (def: safe
   (-> Text Text)
diff --git a/stdlib/source/specification/compositor/generation/function.lux b/stdlib/source/specification/compositor/generation/function.lux
index d97b2c02c..dc92cc224 100644
--- a/stdlib/source/specification/compositor/generation/function.lux
+++ b/stdlib/source/specification/compositor/generation/function.lux
@@ -1,11 +1,11 @@
 (.module:
-  [lux (#- function)
-   ["_" test (#+ Test)]
+  [lux {"-" [function]}
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]
+    [monad {"+" [do]}]
     ["." enum]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." maybe]]
    [data
     [number
@@ -13,16 +13,16 @@
     [collection
      ["." list ("#\." functor)]]]
    [math
-    ["r" random (#+ Random) ("#\." monad)]]
+    ["r" random {"+" [Random]} ("#\." monad)]]
    [tool
     [compiler
-     [analysis (#+ Arity)]
-     ["." reference (#+ Register)]
-     ["." synthesis (#+ Synthesis)]]]]
-  ["." // #_
+     [analysis {"+" [Arity]}]
+     ["." reference {"+" [Register]}]
+     ["." synthesis {"+" [Synthesis]}]]]]
+  ["." // "_"
    ["#." case]
    [//
-    [common (#+ Runner)]]])
+    [common {"+" [Runner]}]]])
 
 (def: max_arity
   Arity
diff --git a/stdlib/source/specification/compositor/generation/primitive.lux b/stdlib/source/specification/compositor/generation/primitive.lux
index cd740649c..a73ba6f21 100644
--- a/stdlib/source/specification/compositor/generation/primitive.lux
+++ b/stdlib/source/specification/compositor/generation/primitive.lux
@@ -1,24 +1,24 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." try]]
    [data
     ["." bit ("#\." equivalence)]
     [number
      ["f" frac]]
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]]
+     ["%" format {"+" [format]}]]]
    [math
     ["r" random]]
    [tool
     [compiler
      ["." synthesis]]]]
   [///
-   [common (#+ Runner)]])
+   [common {"+" [Runner]}]])
 
 (def: (f/=' reference subject)
   (-> Frac Frac Bit)
diff --git a/stdlib/source/specification/compositor/generation/reference.lux b/stdlib/source/specification/compositor/generation/reference.lux
index ee9da7455..bcf2bb2d1 100644
--- a/stdlib/source/specification/compositor/generation/reference.lux
+++ b/stdlib/source/specification/compositor/generation/reference.lux
@@ -1,10 +1,10 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." try]]
    [data
     [number
@@ -15,9 +15,9 @@
      ["." reference]
      ["." synthesis]]]
    [math
-    ["r" random (#+ Random)]]]
+    ["r" random {"+" [Random]}]]]
   [///
-   [common (#+ Runner Definer)]])
+   [common {"+" [Runner Definer]}]])
 
 (def: name
   (Random Name)
diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux
index 33e38520f..4161c650a 100644
--- a/stdlib/source/specification/compositor/generation/structure.lux
+++ b/stdlib/source/specification/compositor/generation/structure.lux
@@ -1,10 +1,10 @@
 (.module:
-  [lux #*
-   ["_" test (#+ Test)]
+  [lux "*"
+   ["_" test {"+" [Test]}]
    [abstract
-    [monad (#+ do)]]
+    [monad {"+" [do]}]]
    [control
-    [pipe (#+ case>)]
+    [pipe {"+" [case>]}]
     ["." maybe]
     ["." try]]
    [data
@@ -12,19 +12,19 @@
      ["n" nat]
      ["i" int]]
     ["." text ("#\." equivalence)
-     ["%" format (#+ format)]]
+     ["%" format {"+" [format]}]]
     [collection
-     ["." array (#+ Array)]
+     ["." array {"+" [Array]}]
      ["." list ("#\." functor)]]]
    [math
     ["r" random]]
-   ["." ffi (#+ import:)]
+   ["." ffi {"+" [import:]}]
    [tool
     [compiler
      ["." analysis]
      ["." synthesis]]]]
   [///
-   [common (#+ Runner)]])
+   [common {"+" [Runner]}]])
 
 (import: java/lang/Integer)
 
diff --git a/stdlib/source/specification/lux/abstract/apply.lux b/stdlib/source/specification/lux/abstract/apply.lux
index 007e4800a..594a42253 100644
--- a/stdlib/source/specification/lux/abstract/apply.lux
+++ b/stdlib/source/specification/lux/abstract/apply.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." function]]
     [math
@@ -11,9 +11,9 @@
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ Apply)]]
+   ["." / {"+" [Apply]}]]
   [//
-   [functor (#+ Injection Comparison)]])
+   [functor {"+" [Injection Comparison]}]])
 
 (def: (identity injection comparison (^open "\."))
   (All (_ f) (-> (Injection f) (Comparison f) (Apply f) Test))
diff --git a/stdlib/source/specification/lux/abstract/codec.lux b/stdlib/source/specification/lux/abstract/codec.lux
index bc256f66f..bea518b69 100644
--- a/stdlib/source/specification/lux/abstract/codec.lux
+++ b/stdlib/source/specification/lux/abstract/codec.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\library
    ["." /
     [//
-     [equivalence (#+ Equivalence)]]]])
+     [equivalence {"+" [Equivalence]}]]]])
 
 (def: .public (spec (^open "@//.") (^open "@//.") generator)
   (All (_ m a) (-> (Equivalence a) (/.Codec m a) (Random a) Test))
diff --git a/stdlib/source/specification/lux/abstract/comonad.lux b/stdlib/source/specification/lux/abstract/comonad.lux
index abcda6f0f..76235ad53 100644
--- a/stdlib/source/specification/lux/abstract/comonad.lux
+++ b/stdlib/source/specification/lux/abstract/comonad.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [math
      ["." random]
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ CoMonad)]]
+   ["." / {"+" [CoMonad]}]]
   [//
-   [functor (#+ Injection Comparison)]])
+   [functor {"+" [Injection Comparison]}]])
 
 (def: (left_identity injection (^open "_//."))
   (All (_ f) (-> (Injection f) (CoMonad f) Test))
diff --git a/stdlib/source/specification/lux/abstract/enum.lux b/stdlib/source/specification/lux/abstract/enum.lux
index a5118918a..2f71401ae 100644
--- a/stdlib/source/specification/lux/abstract/enum.lux
+++ b/stdlib/source/specification/lux/abstract/enum.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/specification/lux/abstract/equivalence.lux b/stdlib/source/specification/lux/abstract/equivalence.lux
index 9a7e3c096..59786ab42 100644
--- a/stdlib/source/specification/lux/abstract/equivalence.lux
+++ b/stdlib/source/specification/lux/abstract/equivalence.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\library
-   ["." / (#+ Equivalence)]])
+   ["." / {"+" [Equivalence]}]])
 
 (def: .public (spec (^open "_//.") random)
   (All (_ a) (-> (Equivalence a) (Random a) Test))
diff --git a/stdlib/source/specification/lux/abstract/functor.lux b/stdlib/source/specification/lux/abstract/functor.lux
index 7d280e610..1186640fa 100644
--- a/stdlib/source/specification/lux/abstract/functor.lux
+++ b/stdlib/source/specification/lux/abstract/functor.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
      ["." function]]
     [math
@@ -12,7 +12,7 @@
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ Functor)]])
+   ["." / {"+" [Functor]}]])
 
 (type: .public (Injection f)
   (All (_ a) (-> a (f a))))
diff --git a/stdlib/source/specification/lux/abstract/functor/contravariant.lux b/stdlib/source/specification/lux/abstract/functor/contravariant.lux
index a2edebd54..a9ac6e660 100644
--- a/stdlib/source/specification/lux/abstract/functor/contravariant.lux
+++ b/stdlib/source/specification/lux/abstract/functor/contravariant.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]]
     [control
      ["." function]]
     [math
@@ -12,7 +12,7 @@
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ Functor)]])
+   ["." / {"+" [Functor]}]])
 
 (def: (identity equivalence value (^open "@//."))
   (All (_ f a) (-> (Equivalence (f a)) (f a) (Functor f) Test))
diff --git a/stdlib/source/specification/lux/abstract/hash.lux b/stdlib/source/specification/lux/abstract/hash.lux
index 2f246bdab..ed504cd26 100644
--- a/stdlib/source/specification/lux/abstract/hash.lux
+++ b/stdlib/source/specification/lux/abstract/hash.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/specification/lux/abstract/interval.lux b/stdlib/source/specification/lux/abstract/interval.lux
index eeea4a1de..a6de2bc5a 100644
--- a/stdlib/source/specification/lux/abstract/interval.lux
+++ b/stdlib/source/specification/lux/abstract/interval.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      ["." order]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/specification/lux/abstract/mix.lux b/stdlib/source/specification/lux/abstract/mix.lux
index d8960947f..dddf30c5f 100644
--- a/stdlib/source/specification/lux/abstract/mix.lux
+++ b/stdlib/source/specification/lux/abstract/mix.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [math
      ["." random]
      [number
       ["n" nat]]]]]
   [//
-   [functor (#+ Injection Comparison)]]
+   [functor {"+" [Injection Comparison]}]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/specification/lux/abstract/monad.lux b/stdlib/source/specification/lux/abstract/monad.lux
index daded437a..2be8f2285 100644
--- a/stdlib/source/specification/lux/abstract/monad.lux
+++ b/stdlib/source/specification/lux/abstract/monad.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [math
      ["." random]
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ do)]]
+   ["." / {"+" [do]}]]
   [//
-   [functor (#+ Injection Comparison)]])
+   [functor {"+" [Injection Comparison]}]])
 
 (def: (left_identity injection comparison (^open "_//."))
   (All (_ f) (-> (Injection f) (Comparison f) (/.Monad f) Test))
diff --git a/stdlib/source/specification/lux/abstract/monoid.lux b/stdlib/source/specification/lux/abstract/monoid.lux
index b11c348ce..6dc4d2207 100644
--- a/stdlib/source/specification/lux/abstract/monoid.lux
+++ b/stdlib/source/specification/lux/abstract/monoid.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\library
    ["." /
     [//
-     [equivalence (#+ Equivalence)]]]])
+     [equivalence {"+" [Equivalence]}]]]])
 
 (def: .public (spec (^open "\.") (^open "\.") gen_sample)
   (All (_ a) (-> (Equivalence a) (/.Monoid a) (Random a) Test))
diff --git a/stdlib/source/specification/lux/abstract/order.lux b/stdlib/source/specification/lux/abstract/order.lux
index 2a8510721..139e8cac4 100644
--- a/stdlib/source/specification/lux/abstract/order.lux
+++ b/stdlib/source/specification/lux/abstract/order.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/specification/lux/world/console.lux b/stdlib/source/specification/lux/world/console.lux
index ee4e47db6..5264211b4 100644
--- a/stdlib/source/specification/lux/world/console.lux
+++ b/stdlib/source/specification/lux/world/console.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
-     [io (#+ IO)]
+     [io {"+" [IO]}]
      ["." try]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." text
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [math
      ["." random]]]]
   [\\library
diff --git a/stdlib/source/specification/lux/world/file.lux b/stdlib/source/specification/lux/world/file.lux
index 8a618c3ae..14cb79211 100644
--- a/stdlib/source/specification/lux/world/file.lux
+++ b/stdlib/source/specification/lux/world/file.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      ["." predicate]]
     [control
-     [pipe (#+ case>)]
-     [io (#+ IO)]
+     [pipe {"+" [case>]}]
+     [io {"+" [IO]}]
      ["." maybe ("#\." functor)]
      ["." try ("#\." functor)]
      ["." exception]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]
+      ["%" format {"+" [format]}]
       [encoding
        ["." utf8 ("#\." codec)]]]
-     ["." binary (#+ Binary) ("#\." equivalence monoid)
+     ["." binary {"+" [Binary]} ("#\." equivalence monoid)
       ["$#" \\test]]
      [collection
       ["." list]]]
@@ -27,7 +27,7 @@
      [number
       ["n" nat]]]
     [time
-     ["." instant (#+ Instant) ("#\." equivalence)]]]]
+     ["." instant {"+" [Instant]} ("#\." equivalence)]]]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/specification/lux/world/program.lux b/stdlib/source/specification/lux/world/program.lux
index db3ffc36f..b1577364a 100644
--- a/stdlib/source/specification/lux/world/program.lux
+++ b/stdlib/source/specification/lux/world/program.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try]
      [concurrency
-      ["." async (#+ Async)]]]
+      ["." async {"+" [Async]}]]]
     [data
      ["." text]
      [collection
diff --git a/stdlib/source/specification/lux/world/shell.lux b/stdlib/source/specification/lux/world/shell.lux
index cedfd317b..3ec8c6142 100644
--- a/stdlib/source/specification/lux/world/shell.lux
+++ b/stdlib/source/specification/lux/world/shell.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try ("#\." functor)]
      [concurrency
-      ["." async (#+ Async) ("#\." monad)]]
+      ["." async {"+" [Async]} ("#\." monad)]]
      [parser
-      ["." environment (#+ Environment)]]]
+      ["." environment {"+" [Environment]}]]]
     [data
      ["." product]
      ["." text ("#\." equivalence)
-      ["%" format (#+ format)]]]
+      ["%" format {"+" [format]}]]]
     [math
      ["." random]
      [number
@@ -22,7 +22,7 @@
   [\\library
    ["." /
     [//
-     [file (#+ Path)]]]])
+     [file {"+" [Path]}]]]])
 
 (template [<name> <command> <type> <prep>]
   [(def: <name>
-- 
cgit v1.2.3