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

39 files changed, 149 insertions, 149 deletions

diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index 70e778090..030404d54 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -1,26 +1,26 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     ["[0]" monad {"+" [do]}]
+     ["[0]" monad {"+" do}]
      ["[0]" enum]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" monoid]]]
     [control
-     ["[0]" try {"+" [Try]}]
-     ["[0]" exception {"+" [Exception]}]]
+     ["[0]" try {"+" Try}]
+     ["[0]" exception {"+" Exception}]]
     [data
      [collection
       ["[0]" list]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["[0]" i64]
       ["n" nat]]]]]
   [\\library
-   ["[0]" / {"+" [Binary]}]])
+   ["[0]" / {"+" Binary}]])
 
 (def: (succeed result)
   (-> (Try Bit) Bit)
diff --git a/stdlib/source/test/lux/data/bit.lux b/stdlib/source/test/lux/data/bit.lux
index 4bd7e6956..02c5ccda9 100644
--- a/stdlib/source/test/lux/data/bit.lux
+++ b/stdlib/source/test/lux/data/bit.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" hash]
diff --git a/stdlib/source/test/lux/data/collection.lux b/stdlib/source/test/lux/data/collection.lux
index b6615368b..4d7de7ed5 100644
--- a/stdlib/source/test/lux/data/collection.lux
+++ b/stdlib/source/test/lux/data/collection.lux
@@ -1,7 +1,7 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]]]
+    ["_" test {"+" Test}]]]
   ["[0]" / "_"
    ["[1][0]" array]
    ["[1][0]" bits]
diff --git a/stdlib/source/test/lux/data/collection/array.lux b/stdlib/source/test/lux/data/collection/array.lux
index 3d875ac3d..95cfc0176 100644
--- a/stdlib/source/test/lux/data/collection/array.lux
+++ b/stdlib/source/test/lux/data/collection/array.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" monoid]
       ["$[0]" mix]
-      ["$[0]" functor {"+" [Injection]}]]]
+      ["$[0]" functor {"+" Injection}]]]
     [control
      ["[0]" maybe]]
     [data
@@ -17,11 +17,11 @@
       ["[0]" list]
       ["[0]" set]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
-   ["[0]" / {"+" [Array]}]])
+   ["[0]" / {"+" Array}]])
 
 (def: injection
   (Injection Array)
diff --git a/stdlib/source/test/lux/data/collection/bits.lux b/stdlib/source/test/lux/data/collection/bits.lux
index 8c7d69241..47167599a 100644
--- a/stdlib/source/test/lux/data/collection/bits.lux
+++ b/stdlib/source/test/lux/data/collection/bits.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      ["[0]" predicate]
      [\\specification
       ["$[0]" equivalence]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
-   ["[0]" / {"+" [Bits]}]])
+   ["[0]" / {"+" Bits}]])
 
 (def: (size min max)
   (-> Nat Nat (Random Nat))
diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux
index 562b20c0e..088a5fd65 100644
--- a/stdlib/source/test/lux/data/collection/dictionary.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary.lux
@@ -1,13 +1,13 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [hash {"+" [Hash]}]
-     [monad {"+" [do]}]
+     [hash {"+" Hash}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
-      ["$[0]" functor {"+" [Injection]}]]]
+      ["$[0]" functor {"+" Injection}]]]
     [control
      ["[0]" maybe ("[1]#[0]" functor)]
      ["[0]" try]
diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
index 3ade2fc0b..b039ceb8d 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
-     [equivalence {"+" [Equivalence]}]
-     [order {"+" [Order]}]
+     [monad {"+" do}]
+     [equivalence {"+" Equivalence}]
+     [order {"+" Order}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -17,7 +17,7 @@
       ["[0]" set]
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux
index f7079325e..2b400c832 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
@@ -15,7 +15,7 @@
       ["[0]" set]
       ["[0]" list]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux
index 44316d6a5..5003567ee 100644
--- a/stdlib/source/test/lux/data/collection/list.lux
+++ b/stdlib/source/test/lux/data/collection/list.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      ["[0]" enum]
      [\\specification
       ["$[0]" equivalence]
@@ -25,7 +25,7 @@
      [collection
       ["[0]" set]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]
       ["[0]" int]]]]]
diff --git a/stdlib/source/test/lux/data/collection/queue.lux b/stdlib/source/test/lux/data/collection/queue.lux
index 7d5cf2f01..549f3777c 100644
--- a/stdlib/source/test/lux/data/collection/queue.lux
+++ b/stdlib/source/test/lux/data/collection/queue.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
-      ["$[0]" functor {"+" [Injection]}]]]
+      ["$[0]" functor {"+" Injection}]]]
     [data
      ["[0]" bit ("[1]#[0]" equivalence)]
      [collection
diff --git a/stdlib/source/test/lux/data/collection/queue/priority.lux b/stdlib/source/test/lux/data/collection/queue/priority.lux
index 06f2edef4..d5e7d86d3 100644
--- a/stdlib/source/test/lux/data/collection/queue/priority.lux
+++ b/stdlib/source/test/lux/data/collection/queue/priority.lux
@@ -1,19 +1,19 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     ["[0]" monad {"+" [do]}]]
+     ["[0]" monad {"+" do}]]
     [control
      ["[0]" maybe ("[1]#[0]" functor)]]
     [data
      ["[0]" bit ("[1]#[0]" equivalence)]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
-   ["[0]" / {"+" [Queue]}]])
+   ["[0]" / {"+" Queue}]])
 
 (def: .public (random size)
   (-> Nat (Random (Queue Nat)))
diff --git a/stdlib/source/test/lux/data/collection/row.lux b/stdlib/source/test/lux/data/collection/row.lux
index 1e2180361..8728a6df9 100644
--- a/stdlib/source/test/lux/data/collection/row.lux
+++ b/stdlib/source/test/lux/data/collection/row.lux
@@ -1,18 +1,18 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" monoid]
       ["$[0]" mix]
-      ["$[0]" functor {"+" [Injection]}]
+      ["$[0]" functor {"+" Injection}]
       ["$[0]" apply]
       ["$[0]" monad]]]
     [control
-     ["[0]" try {"+" [Try]}]
+     ["[0]" try {"+" Try}]
      ["[0]" exception]]
     [data
      ["[0]" bit ("[1]#[0]" equivalence)]
diff --git a/stdlib/source/test/lux/data/collection/sequence.lux b/stdlib/source/test/lux/data/collection/sequence.lux
index 2c9a8aca5..22dc1b37e 100644
--- a/stdlib/source/test/lux/data/collection/sequence.lux
+++ b/stdlib/source/test/lux/data/collection/sequence.lux
@@ -1,17 +1,17 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
-     [equivalence {"+" [Equivalence]}]
+     [monad {"+" do}]
+     [equivalence {"+" Equivalence}]
      ["[0]" enum]
      [\\specification
       ["$[0]" functor]
       ["$[0]" comonad]]]
     [data
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
diff --git a/stdlib/source/test/lux/data/collection/set.lux b/stdlib/source/test/lux/data/collection/set.lux
index 7cf9debe0..726265db3 100644
--- a/stdlib/source/test/lux/data/collection/set.lux
+++ b/stdlib/source/test/lux/data/collection/set.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [hash {"+" [Hash]}]
-     [monad {"+" [do]}]
+     [hash {"+" Hash}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" hash]
@@ -14,7 +14,7 @@
      [collection
       ["[0]" list]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux
index b281e85bd..57353ec6d 100644
--- a/stdlib/source/test/lux/data/collection/set/multi.lux
+++ b/stdlib/source/test/lux/data/collection/set/multi.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [hash {"+" [Hash]}]
-     [monad {"+" [do]}]
+     [hash {"+" Hash}]
+     [monad {"+" do}]
      ["[0]" predicate]
      [\\specification
       ["$[0]" equivalence]
@@ -15,7 +15,7 @@
       ["[0]" set]
       ["[0]" list ("[1]#[0]" mix)]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/data/collection/set/ordered.lux b/stdlib/source/test/lux/data/collection/set/ordered.lux
index 33ddfc89d..ce65cbfa5 100644
--- a/stdlib/source/test/lux/data/collection/set/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/set/ordered.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
-     [order {"+" [Order]}]
+     [monad {"+" do}]
+     [order {"+" Order}]
      [\\specification
       ["$[0]" equivalence]]]
     [data
@@ -12,11 +12,11 @@
      [collection
       ["[0]" list]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]]]
   [\\library
-   ["[0]" / {"+" [Set]}
+   ["[0]" / {"+" Set}
     ["[0]" //]]])
 
 (def: size
diff --git a/stdlib/source/test/lux/data/collection/stack.lux b/stdlib/source/test/lux/data/collection/stack.lux
index 3ca1e508a..46feb6817 100644
--- a/stdlib/source/test/lux/data/collection/stack.lux
+++ b/stdlib/source/test/lux/data/collection/stack.lux
@@ -1,12 +1,12 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
-      ["$[0]" functor {"+" [Injection]}]]]
+      ["$[0]" functor {"+" Injection}]]]
     [control
      ["[0]" maybe]]
     [data
diff --git a/stdlib/source/test/lux/data/collection/tree.lux b/stdlib/source/test/lux/data/collection/tree.lux
index 9cba03540..92447eb1e 100644
--- a/stdlib/source/test/lux/data/collection/tree.lux
+++ b/stdlib/source/test/lux/data/collection/tree.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     ["[0]" monad {"+" [do]}]
+     ["[0]" monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" mix]
@@ -13,11 +13,11 @@
      [collection
       ["[0]" list ("[1]#[0]" functor mix)]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
-   ["[0]" / {"+" [Tree]}]])
+   ["[0]" / {"+" Tree}]])
 
 (def: .public (tree gen_value)
   (All (_ a) (-> (Random a) (Random [Nat (Tree a)])))
diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux
index 5285a8eca..3724c7e13 100644
--- a/stdlib/source/test/lux/data/collection/tree/finger.lux
+++ b/stdlib/source/test/lux/data/collection/tree/finger.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" maybe ("[1]#[0]" functor)]]
     [data
@@ -14,7 +14,7 @@
      ["[0]" random]
      [number
       ["n" nat]]]
-    [type {"+" [:by_example]}]]]
+    [type {"+" :by_example}]]]
   [\\library
    ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/collection/tree/zipper.lux b/stdlib/source/test/lux/data/collection/tree/zipper.lux
index bda2162f9..5b462d763 100644
--- a/stdlib/source/test/lux/data/collection/tree/zipper.lux
+++ b/stdlib/source/test/lux/data/collection/tree/zipper.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" functor]
@@ -22,7 +22,7 @@
       ["n" nat]]]]]
   ["[0]" //]
   [\\library
-   ["[0]" / {"+" [Zipper]}
+   ["[0]" / {"+" Zipper}
     ["tree" //]]])
 
 (def: move
diff --git a/stdlib/source/test/lux/data/color.lux b/stdlib/source/test/lux/data/color.lux
index cf2f1053c..9e82ba23d 100644
--- a/stdlib/source/test/lux/data/color.lux
+++ b/stdlib/source/test/lux/data/color.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" hash]
@@ -14,7 +14,7 @@
     [macro
      ["[0]" template]]
     ["[0]" math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]
       ["[0]" int]
diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux
index 939a95ffe..bb8eeb2d7 100644
--- a/stdlib/source/test/lux/data/color/named.lux
+++ b/stdlib/source/test/lux/data/color/named.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      [collection
       ["[0]" list]
@@ -11,7 +11,7 @@
     [macro
      ["[0]" template]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/data/format/binary.lux b/stdlib/source/test/lux/data/format/binary.lux
index bb09a2f77..0b58d31bc 100644
--- a/stdlib/source/test/lux/data/format/binary.lux
+++ b/stdlib/source/test/lux/data/format/binary.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [equivalence {"+" [Equivalence]}]
-     [monad {"+" [do]}]
+     [equivalence {"+" Equivalence}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" monoid]]]
     [data
      ["[0]" binary ("[1]#[0]" equivalence)]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [\\library
    ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index 35381fc7a..f12831ab8 100644
--- a/stdlib/source/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     ["[0]" meta]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" codec]]]
@@ -14,22 +14,22 @@
      ["[0]" product]
      ["[0]" bit]
      ["[0]" text
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" row]
       ["[0]" dictionary]
       ["[0]" set]
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]
       ["[0]" frac]]]
     ["[0]" macro
-     ["[0]" syntax {"+" [syntax:]}]
+     ["[0]" syntax {"+" syntax:}]
      ["[0]" code]]]]
   [\\library
-   ["[0]" / {"+" [JSON]} ("#[0]" equivalence)]])
+   ["[0]" / {"+" JSON} ("#[0]" equivalence)]])
 
 (def: .public random
   (Random /.JSON)
diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux
index 4ada18f50..e01670420 100644
--- a/stdlib/source/test/lux/data/format/tar.lux
+++ b/stdlib/source/test/lux/data/format/tar.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" maybe]
      ["[0]" try]
@@ -14,7 +14,7 @@
      ["[0]" product]
      ["[0]" binary ("[1]#[0]" equivalence monoid)]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]
+      ["%" format {"+" format}]
       [encoding
        ["[0]" utf8]]
       ["[0]" unicode "_"
@@ -26,10 +26,10 @@
      ["[0]" format "_"
       ["[1]" binary]]]
     [time
-     ["[0]" instant {"+" [Instant]}]
+     ["[0]" instant {"+" Instant}]
      ["[0]" duration]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]
       ["i" int]]]]]
diff --git a/stdlib/source/test/lux/data/format/xml.lux b/stdlib/source/test/lux/data/format/xml.lux
index e6772262f..3f94d894f 100644
--- a/stdlib/source/test/lux/data/format/xml.lux
+++ b/stdlib/source/test/lux/data/format/xml.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [char]}
-    ["_" test {"+" [Test]}]
+   [lux {"-" char}
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [Monad do]}]
+     [monad {"+" Monad do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" codec]]]
@@ -16,16 +16,16 @@
     [data
      ["[0]" name]
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+      ["%" format {"+" format}]]
      [collection
       ["[0]" dictionary]
       ["[0]" list ("[1]#[0]" functor)]]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      [number
       ["n" nat]]]]]
   [\\library
-   ["[0]" / {"+" [XML]}]])
+   ["[0]" / {"+" XML}]])
 
 (def: char_range
   Text
diff --git a/stdlib/source/test/lux/data/identity.lux b/stdlib/source/test/lux/data/identity.lux
index 584f7f5e0..5a7b3790c 100644
--- a/stdlib/source/test/lux/data/identity.lux
+++ b/stdlib/source/test/lux/data/identity.lux
@@ -1,16 +1,16 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
-      ["$[0]" functor {"+" [Injection Comparison]}]
+      ["$[0]" functor {"+" Injection Comparison}]
       ["$[0]" apply]
       ["$[0]" monad]
       ["$[0]" comonad]]]]]
   [\\library
-   ["[0]" / {"+" [Identity]}]])
+   ["[0]" / {"+" Identity}]])
 
 (def: injection
   (Injection Identity)
diff --git a/stdlib/source/test/lux/data/name.lux b/stdlib/source/test/lux/data/name.lux
index 76761b0ae..a069d846e 100644
--- a/stdlib/source/test/lux/data/name.lux
+++ b/stdlib/source/test/lux/data/name.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" hash]
@@ -14,7 +14,7 @@
     [data
      ["[0]" text ("[1]#[0]" equivalence)]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/data/product.lux b/stdlib/source/test/lux/data/product.lux
index c4e666117..cb8ba7ac0 100644
--- a/stdlib/source/test/lux/data/product.lux
+++ b/stdlib/source/test/lux/data/product.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [math
diff --git a/stdlib/source/test/lux/data/sum.lux b/stdlib/source/test/lux/data/sum.lux
index 761bda10c..11d66187b 100644
--- a/stdlib/source/test/lux/data/sum.lux
+++ b/stdlib/source/test/lux/data/sum.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [control
diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index ff8ed74dd..076d00df3 100644
--- a/stdlib/source/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
-   [lux {"-" [char]}
-    ["_" test {"+" [Test]}]
+   [lux {"-" char}
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" hash]
diff --git a/stdlib/source/test/lux/data/text/buffer.lux b/stdlib/source/test/lux/data/text/buffer.lux
index 018ce9a22..b835fbb01 100644
--- a/stdlib/source/test/lux/data/text/buffer.lux
+++ b/stdlib/source/test/lux/data/text/buffer.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux
index 2644c2e43..9147ec9aa 100644
--- a/stdlib/source/test/lux/data/text/encoding.lux
+++ b/stdlib/source/test/lux/data/text/encoding.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" codec]]]
     [control
@@ -17,7 +17,7 @@
     [macro
      ["[0]" template]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   [\\library
diff --git a/stdlib/source/test/lux/data/text/encoding/utf8.lux b/stdlib/source/test/lux/data/text/encoding/utf8.lux
index aa9b9f93b..29dae385b 100644
--- a/stdlib/source/test/lux/data/text/encoding/utf8.lux
+++ b/stdlib/source/test/lux/data/text/encoding/utf8.lux
@@ -1,14 +1,14 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
      [\\specification
       ["$[0]" codec]]]
     [data
      ["[0]" text]]
     [math
-     ["[0]" random {"+" [Random]}]]]]
+     ["[0]" random {"+" Random}]]]]
   [\\library
    ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux
index 43dde1c22..9e7ddbcf6 100644
--- a/stdlib/source/test/lux/data/text/escape.lux
+++ b/stdlib/source/test/lux/data/text/escape.lux
@@ -1,11 +1,11 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     ["[0]" debug]
     ["[0]" meta]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      ["[0]" try]
      ["[0]" exception]
@@ -13,17 +13,17 @@
       ["<[0]>" code]]]
     [data
      ["[0]" bit ("[1]#[0]" equivalence)]
-     ["[0]" text {"+" [Char]} ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]
+     ["[0]" text {"+" Char} ("[1]#[0]" equivalence)
+      ["%" format {"+" format}]]
      [collection
-      ["[0]" set {"+" [Set]}]]]
+      ["[0]" set {"+" Set}]]]
     [macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]
      ["[0]" template]]
     [math
-     ["[0]" random {"+" [Random]}]
-     [number {"+" [hex]}
+     ["[0]" random {"+" Random}]
+     [number {"+" hex}
       ["n" nat]]]]]
   [\\library
    ["[0]" /
diff --git a/stdlib/source/test/lux/data/text/format.lux b/stdlib/source/test/lux/data/text/format.lux
index 2bfc7a74e..aa3a6b2cd 100644
--- a/stdlib/source/test/lux/data/text/format.lux
+++ b/stdlib/source/test/lux/data/text/format.lux
@@ -1,10 +1,10 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
-     [equivalence {"+" [Equivalence]}]
+     [monad {"+" do}]
+     [equivalence {"+" Equivalence}]
      [functor
       [\\specification
        ["$[0]" contravariant]]]]
@@ -26,7 +26,7 @@
      ["[0]" duration]
      ["[0]" date]]
     [math
-     ["[0]" random {"+" [Random]} ("[1]#[0]" monad)]
+     ["[0]" random {"+" Random} ("[1]#[0]" monad)]
      ["[0]" modulus]
      ["[0]" modular]
      [number
diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index cfc58a897..2eb5ad7e0 100644
--- a/stdlib/source/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
@@ -1,23 +1,23 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]]
+     [monad {"+" do}]]
     [control
      pipe
      ["[0]" try]
      [parser
-      ["<[0]>" text {"+" [Parser]}]
+      ["<[0]>" text {"+" Parser}]
       ["<[0]>" code]]]
     [data
      ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" [format]}]]]
+      ["%" format {"+" format}]]]
     ["[0]" macro
-     [syntax {"+" [syntax:]}]
+     [syntax {"+" syntax:}]
      ["[0]" code]]
     [math
-     [number {"+" [hex]}]
+     [number {"+" hex}]
      ["[0]" random]]]]
   [\\library
    ["[0]" /]])
diff --git a/stdlib/source/test/lux/data/text/unicode/block.lux b/stdlib/source/test/lux/data/text/unicode/block.lux
index e01250a30..e16ce9462 100644
--- a/stdlib/source/test/lux/data/text/unicode/block.lux
+++ b/stdlib/source/test/lux/data/text/unicode/block.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]
       ["$[0]" hash]
@@ -16,8 +16,8 @@
     [macro
      ["[0]" template]]
     [math
-     ["[0]" random {"+" [Random]}]
-     [number {"+" [hex]}
+     ["[0]" random {"+" Random}]
+     [number {"+" hex}
       ["n" nat]]]]]
   [\\library
    ["[0]" /]])
diff --git a/stdlib/source/test/lux/data/text/unicode/set.lux b/stdlib/source/test/lux/data/text/unicode/set.lux
index fe145fd50..cda724eda 100644
--- a/stdlib/source/test/lux/data/text/unicode/set.lux
+++ b/stdlib/source/test/lux/data/text/unicode/set.lux
@@ -1,9 +1,9 @@
 (.module:
   [library
    [lux "*"
-    ["_" test {"+" [Test]}]
+    ["_" test {"+" Test}]
     [abstract
-     [monad {"+" [do]}]
+     [monad {"+" do}]
      [\\specification
       ["$[0]" equivalence]]]
     [data
@@ -12,7 +12,7 @@
      [collection
       ["[0]" set ("[1]#[0]" equivalence)]]]
     [math
-     ["[0]" random {"+" [Random]}]
+     ["[0]" random {"+" Random}]
      [number
       ["n" nat]]]]]
   ["[0]" / "_"