16 files changed, 76 insertions, 76 deletions
diff --git a/stdlib/source/test/lux/abstract/apply.lux b/stdlib/source/test/lux/abstract/apply.lux
index 75da1dc47..9eeb5f008 100644
--- a/stdlib/source/test/lux/abstract/apply.lux
+++ b/stdlib/source/test/lux/abstract/apply.lux
@@ -1,8 +1,8 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." maybe]]
     [data
@@ -12,9 +12,9 @@
      ["." random]
      [number
       ["n" nat]]]
-    ["_" test (#+ Test)]]]
+    ["_" test {"+" [Test]}]]]
   [\\library
-   ["." / (#+ Apply)]])
+   ["." / {"+" [Apply]}]])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/abstract/codec.lux b/stdlib/source/test/lux/abstract/codec.lux
index 32668c30f..53fc7a327 100644
--- a/stdlib/source/test/lux/abstract/codec.lux
+++ b/stdlib/source/test/lux/abstract/codec.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." try]]
     [data
      ["." bit ("#\." equivalence)]
      [format
-      ["." json (#+ JSON)]]]
+      ["." json {"+" [JSON]}]]]
     [math
-     ["." random (#+ Random)]]]]
+     ["." random {"+" [Random]}]]]]
   [\\library
-   ["." / (#+ Codec)
+   ["." / {"+" [Codec]}
     [//
-     [equivalence (#+ Equivalence)]]]])
+     [equivalence {"+" [Equivalence]}]]]])
 
 (def: json
   (Codec JSON Bit)
diff --git a/stdlib/source/test/lux/abstract/comonad.lux b/stdlib/source/test/lux/abstract/comonad.lux
index 05067e786..66c97e94a 100644
--- a/stdlib/source/test/lux/abstract/comonad.lux
+++ b/stdlib/source/test/lux/abstract/comonad.lux
@@ -1,15 +1,15 @@
 (.module:
   [library
-   [lux #*
+   [lux "*"
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [data
-     ["." identity (#+ Identity)]]
+     ["." identity {"+" [Identity]}]]
     [math
      ["." random]
      [number
       ["n" nat]]]
-    ["_" test (#+ Test)]]]
+    ["_" test {"+" [Test]}]]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/test/lux/abstract/comonad/cofree.lux b/stdlib/source/test/lux/abstract/comonad/cofree.lux
index 226b152bc..b4d530273 100644
--- a/stdlib/source/test/lux/abstract/comonad/cofree.lux
+++ b/stdlib/source/test/lux/abstract/comonad/cofree.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [functor (#+ Functor)]
-     [comonad (#+ CoMonad)]
+     [functor {"+" [Functor]}]
+     [comonad {"+" [CoMonad]}]
      [\\specification
-      ["$." functor (#+ Injection Comparison)]
+      ["$." functor {"+" [Injection Comparison]}]
       ["$." comonad]]]
     [control
      ["//" continuation]]
     [data
      [collection
       ["." list]
-      ["." sequence (#+ Sequence) ("#\." comonad)]]]
+      ["." sequence {"+" [Sequence]} ("#\." comonad)]]]
     [math
      ["." random]]]]
   [\\library
diff --git a/stdlib/source/test/lux/abstract/enum.lux b/stdlib/source/test/lux/abstract/enum.lux
index afb40be03..3b1fc2483 100644
--- a/stdlib/source/test/lux/abstract/enum.lux
+++ b/stdlib/source/test/lux/abstract/enum.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." maybe ("#\." functor)]]
     [data
@@ -11,7 +11,7 @@
      [collection
       ["." list ("#\." mix)]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/abstract/equivalence.lux b/stdlib/source/test/lux/abstract/equivalence.lux
index 89fa542a1..e2165cd9e 100644
--- a/stdlib/source/test/lux/abstract/equivalence.lux
+++ b/stdlib/source/test/lux/abstract/equivalence.lux
@@ -1,21 +1,21 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       [functor
        ["$." contravariant]]]]
     [data
      ["." bit ("#\." equivalence)]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]
       ["i" int]]]]]
   [\\library
-   ["." / (#+ Equivalence)]])
+   ["." / {"+" [Equivalence]}]])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/abstract/functor.lux b/stdlib/source/test/lux/abstract/functor.lux
index c2d48f298..d2aa86a6f 100644
--- a/stdlib/source/test/lux/abstract/functor.lux
+++ b/stdlib/source/test/lux/abstract/functor.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [control
      ["." maybe]]
     [data
@@ -14,7 +14,7 @@
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ Functor)]])
+   ["." / {"+" [Functor]}]])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/abstract/functor/contravariant.lux b/stdlib/source/test/lux/abstract/functor/contravariant.lux
index 26d7032a2..c36043918 100644
--- a/stdlib/source/test/lux/abstract/functor/contravariant.lux
+++ b/stdlib/source/test/lux/abstract/functor/contravariant.lux
@@ -1,7 +1,7 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]]]
+   [lux "*"
+    ["_" test {"+" [Test]}]]]
   [\\library
    ["." /]])
 
diff --git a/stdlib/source/test/lux/abstract/hash.lux b/stdlib/source/test/lux/abstract/hash.lux
index 4d5fa9eaf..27e06e7f8 100644
--- a/stdlib/source/test/lux/abstract/hash.lux
+++ b/stdlib/source/test/lux/abstract/hash.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       [functor
        ["$." contravariant]]]]
@@ -14,9 +14,9 @@
      [number
       ["." nat]]]]]
   [\\library
-   ["." / (#+ Hash)
+   ["." / {"+" [Hash]}
     [//
-     [equivalence (#+ Equivalence)]]]])
+     [equivalence {"+" [Equivalence]}]]]])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/abstract/interval.lux b/stdlib/source/test/lux/abstract/interval.lux
index 6be3c331b..d38bcac05 100644
--- a/stdlib/source/test/lux/abstract/interval.lux
+++ b/stdlib/source/test/lux/abstract/interval.lux
@@ -1,24 +1,24 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      ["." order]
      [\\specification
       ["$." equivalence]]]
     [control
-     [pipe (#+ case>)]]
+     [pipe {"+" [case>]}]]
     [data
      [collection
       ["." set]
       ["." list]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ Interval) ("\." equivalence)]])
+   ["." / {"+" [Interval]} ("\." equivalence)]])
 
 (template [<name> <cmp>]
   [(def: .public <name>
diff --git a/stdlib/source/test/lux/abstract/mix.lux b/stdlib/source/test/lux/abstract/mix.lux
index a93f24cc9..f4236cfd7 100644
--- a/stdlib/source/test/lux/abstract/mix.lux
+++ b/stdlib/source/test/lux/abstract/mix.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [data
      [collection
       ["." list]]]
@@ -12,7 +12,7 @@
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ Mix)]])
+   ["." / {"+" [Mix]}]])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/abstract/monad.lux b/stdlib/source/test/lux/abstract/monad.lux
index db0829989..2ad25583e 100644
--- a/stdlib/source/test/lux/abstract/monad.lux
+++ b/stdlib/source/test/lux/abstract/monad.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [data
-     ["." identity (#+ Identity)]
+     ["." identity {"+" [Identity]}]
      [collection
       ["." list ("#\." functor mix)]]]
     [math
@@ -11,7 +11,7 @@
      [number
       ["n" nat]]]]]
   [\\library
-   ["." / (#+ Monad do)]])
+   ["." / {"+" [Monad do]}]])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/abstract/monad/free.lux b/stdlib/source/test/lux/abstract/monad/free.lux
index 15c0bd8da..9fa406919 100644
--- a/stdlib/source/test/lux/abstract/monad/free.lux
+++ b/stdlib/source/test/lux/abstract/monad/free.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [functor (#+ Functor)]
-     [apply (#+ Apply)]
-     [monad (#+ Monad do)]
+     [functor {"+" [Functor]}]
+     [apply {"+" [Apply]}]
+     [monad {"+" [Monad do]}]
      [\\specification
-      ["$." functor (#+ Injection Comparison)]
+      ["$." functor {"+" [Injection Comparison]}]
       ["$." apply]
       ["$." monad]]]
     [data
diff --git a/stdlib/source/test/lux/abstract/monoid.lux b/stdlib/source/test/lux/abstract/monoid.lux
index 95d932e81..bfca808a9 100644
--- a/stdlib/source/test/lux/abstract/monoid.lux
+++ b/stdlib/source/test/lux/abstract/monoid.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]]
+     [monad {"+" [do]}]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["." nat]
       ["." int]]]]]
   [\\library
    ["." /
     [//
-     [equivalence (#+ Equivalence)]]]])
+     [equivalence {"+" [Equivalence]}]]]])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/abstract/order.lux b/stdlib/source/test/lux/abstract/order.lux
index 564b731e8..e81919f19 100644
--- a/stdlib/source/test/lux/abstract/order.lux
+++ b/stdlib/source/test/lux/abstract/order.lux
@@ -1,22 +1,22 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [monad (#+ do)]
+     [monad {"+" [do]}]
      [\\specification
       [functor
        ["$." contravariant]]]]
     [data
      ["." bit ("#\." equivalence)]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]]]
   [\\library
    ["." /
     [//
-     [equivalence (#+ Equivalence)]]]])
+     [equivalence {"+" [Equivalence]}]]]])
 
 (def: .public test
   Test
diff --git a/stdlib/source/test/lux/abstract/predicate.lux b/stdlib/source/test/lux/abstract/predicate.lux
index 098136df4..4f313cd44 100644
--- a/stdlib/source/test/lux/abstract/predicate.lux
+++ b/stdlib/source/test/lux/abstract/predicate.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
-   [lux #*
-    ["_" test (#+ Test)]
+   [lux "*"
+    ["_" test {"+" [Test]}]
     [abstract
-     [equivalence (#+ Equivalence)]
-     [monad (#+ do)]
+     [equivalence {"+" [Equivalence]}]
+     [monad {"+" [do]}]
      [\\specification
       ["$." monoid]
       [functor
@@ -16,7 +16,7 @@
      [collection
       ["." list]]]
     [math
-     ["." random (#+ Random)]
+     ["." random {"+" [Random]}]
      [number
       ["n" nat]]]]]
   [\\library