- Improvements to import syntax [part 2].

86 files changed, 1343 insertions, 993 deletions

diff --git a/stdlib/test/test/lux.lux b/stdlib/test/test/lux.lux
index 538a70b30..706e6e4bb 100644
--- a/stdlib/test/test/lux.lux
+++ b/stdlib/test/test/lux.lux
@@ -1,15 +1,17 @@
 (.module:
-  lux
-  lux/test
-  (lux (control [monad (#+ do)])
-       [math]
-       ["r" math/random]
-       (data [maybe]
-             [bit]
-             [text ("text/" Equivalence<Text>)]
-             text/format)
-       [macro]
-       (macro ["s" syntax (#+ syntax:)])))
+  [lux #*
+   [control
+    [monad (#+ do)]]
+   [math]
+   ["r" math/random]
+   [data
+    [maybe]
+    [bit]
+    [text ("text/" Equivalence<Text>)
+     format]]
+   ["." macro
+    ["s" syntax (#+ syntax:)]]
+   test])
 
 (context: "Value identity."
   (<| (times +100)
diff --git a/stdlib/test/test/lux/cli.lux b/stdlib/test/test/lux/cli.lux
index fc9ffa280..208b5b1b2 100644
--- a/stdlib/test/test/lux/cli.lux
+++ b/stdlib/test/test/lux/cli.lux
@@ -1,18 +1,20 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                pipe
-                ["p" parser])
-       (data [product]
-             [sum]
-             ["E" error]
-             [number]
-             [text ("text/" Equivalence<Text>)]
-             text/format
-             (collection [list]))
-       ["r" math/random]
-       ["/" cli])
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe
+    ["p" parser]]
+   [data
+    [product]
+    [sum]
+    ["E" error]
+    [number]
+    [text ("text/" Equivalence<Text>)
+     format]
+    [collection [list]]]
+   [math ["r" random]]
+   ["/" cli]]
   lux/test)
 
 (context: "CLI"
diff --git a/stdlib/test/test/lux/concurrency/actor.lux b/stdlib/test/test/lux/concurrency/actor.lux
index 7895350e6..1bb6b5b0b 100644
--- a/stdlib/test/test/lux/concurrency/actor.lux
+++ b/stdlib/test/test/lux/concurrency/actor.lux
@@ -1,14 +1,18 @@
 (.module:
-  lux
-  (lux [io (#+ IO io)]
-       (control ["M" monad (#+ do Monad)]
-                ["ex" exception])
-       (data [number]
-             text/format
-             ["e" error])
-       (concurrency ["P" promise ("promise/" Monad<Promise>)]
-                    ["T" task]
-                    ["&" actor (#+ actor: message:)]))
+  [lux #*
+   [io (#+ IO io)]
+   [control
+    ["M" monad (#+ do Monad)]
+    ["ex" exception]]
+   [data
+    ["e" error]
+    [number]
+    [text
+     format]]
+   [concurrency
+    ["P" promise ("promise/" Monad<Promise>)]
+    ["T" task]
+    ["&" actor (#+ actor: message:)]]]
   lux/test)
 
 (actor: Counter
diff --git a/stdlib/test/test/lux/concurrency/atom.lux b/stdlib/test/test/lux/concurrency/atom.lux
index 36dc59074..77f52b94d 100644
--- a/stdlib/test/test/lux/concurrency/atom.lux
+++ b/stdlib/test/test/lux/concurrency/atom.lux
@@ -1,12 +1,16 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)])
-       (data [number]
-             (collection [list "" Functor<List>])
-             text/format)
-       (concurrency ["&" atom])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]]
+   [data
+    [number]
+    [text
+     format]]
+   [concurrency
+    ["&" atom]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Atoms"
diff --git a/stdlib/test/test/lux/concurrency/frp.lux b/stdlib/test/test/lux/concurrency/frp.lux
index 637892e3b..0cb6b7831 100644
--- a/stdlib/test/test/lux/concurrency/frp.lux
+++ b/stdlib/test/test/lux/concurrency/frp.lux
@@ -1,13 +1,18 @@
 (.module:
-  lux
-  (lux [io (#+ IO io)]
-       (control [monad (#+ do Monad)])
-       (data [number]
-             text/format
-             (collection [list]))
-       (concurrency [promise ("promise/" Monad<Promise>)]
-                    [frp (#+ Channel)]
-                    [atom (#+ Atom atom)]))
+  [lux #*
+   [io (#+ IO io)]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [number]
+    [text
+     format]
+    [collection
+     [list]]]
+   [concurrency
+    [promise ("promise/" Monad<Promise>)]
+    [frp (#+ Channel)]
+    [atom (#+ Atom atom)]]]
   lux/test)
 
 (def: (write! values channel)
diff --git a/stdlib/test/test/lux/concurrency/promise.lux b/stdlib/test/test/lux/concurrency/promise.lux
index b6540c145..f0b0bb865 100644
--- a/stdlib/test/test/lux/concurrency/promise.lux
+++ b/stdlib/test/test/lux/concurrency/promise.lux
@@ -1,12 +1,17 @@
 (.module:
-  lux
-  (lux [io (#+ IO io)]
-       (control ["M" monad (#+ do Monad)]
-                pipe)
-       (data [number]
-             text/format)
-       (concurrency ["&" promise ("&/" Monad<Promise>)])
-       ["r" math/random])
+  [lux #*
+   [io (#+ IO io)]
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe]
+   [data
+    [number]
+    [text
+     format]]
+   [concurrency
+    ["&" promise ("&/" Monad<Promise>)]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Promises"
diff --git a/stdlib/test/test/lux/concurrency/semaphore.lux b/stdlib/test/test/lux/concurrency/semaphore.lux
index c09b48545..8a5c1cbce 100644
--- a/stdlib/test/test/lux/concurrency/semaphore.lux
+++ b/stdlib/test/test/lux/concurrency/semaphore.lux
@@ -1,15 +1,19 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do)])
-       (data [maybe]
-             [text ("text/" Equivalence<Text> Monoid<Text>)]
-             text/format
-             (collection [list ("list/" Functor<List>)]))
-       (concurrency ["/" semaphore]
-                    [promise (#+ Promise)]
-                    [atom (#+ Atom)])
-       [io]
-       ["r" math/random])
+  [lux #*
+   [control
+    [monad (#+ do)]]
+   [data
+    [maybe]
+    [text ("text/" Equivalence<Text> Monoid<Text>)
+     format]
+    [collection [list ("list/" Functor<List>)]]]
+   [concurrency
+    ["/" semaphore]
+    [promise (#+ Promise)]
+    [atom (#+ Atom)]]
+   [io]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: (wait-many-times times semaphore)
diff --git a/stdlib/test/test/lux/concurrency/stm.lux b/stdlib/test/test/lux/concurrency/stm.lux
index c2d2dc8c0..1a254284f 100644
--- a/stdlib/test/test/lux/concurrency/stm.lux
+++ b/stdlib/test/test/lux/concurrency/stm.lux
@@ -1,16 +1,21 @@
 (.module:
-  lux
-  (lux [io (#+ IO)]
-       (control ["M" monad (#+ do Monad)])
-       (data [number]
-             [maybe]
-             (collection [list ("list/" Functor<List>)])
-             text/format)
-       (concurrency [atom (#+ Atom atom)]
-                    ["&" stm]
-                    [promise]
-                    [frp (#+ Channel)])
-       ["r" math/random])
+  [lux #*
+   [io (#+ IO)]
+   [control
+    ["M" monad (#+ do Monad)]]
+   [data
+    [number]
+    [maybe]
+    [text format]
+    [collection
+     [list ("list/" Functor<List>)]]]
+   [concurrency
+    [atom (#+ Atom atom)]
+    ["&" stm]
+    [promise]
+    [frp (#+ Channel)]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: (read! channel)
diff --git a/stdlib/test/test/lux/control/continuation.lux b/stdlib/test/test/lux/control/continuation.lux
index cc8297cd7..9d5cad55b 100644
--- a/stdlib/test/test/lux/control/continuation.lux
+++ b/stdlib/test/test/lux/control/continuation.lux
@@ -1,10 +1,12 @@
 (.module:
-  lux
-  (lux (control ["M" monad (#+ do Monad)]
-                ["&" continuation])
-       (data [number]
-             (collection [list]))
-       ["r" math/random])
+  [lux #*
+   [control
+    ["M" monad (#+ do Monad)]
+    ["&" continuation]]
+   [data
+    [number]
+    [collection [list]]]
+   ["r" math/random]]
   lux/test)
 
 (context: "Continuations"
diff --git a/stdlib/test/test/lux/control/equivalence.lux b/stdlib/test/test/lux/control/equivalence.lux
index 5fd317fe4..5206e892d 100644
--- a/stdlib/test/test/lux/control/equivalence.lux
+++ b/stdlib/test/test/lux/control/equivalence.lux
@@ -1,9 +1,11 @@
 (.module:
-  lux
-  (lux (control ["/" equivalence]
-                [monad (#+ do)])
-       (math ["r" random])
-       test))
+  [lux #*
+   [control
+    ["/" equivalence]
+    [monad (#+ do)]]
+   [math
+    ["r" random]]
+   test])
 
 (def: #export (spec Equivalence<a> generator)
   (All [a] (-> (/.Equivalence a) (r.Random a) Test))
diff --git a/stdlib/test/test/lux/control/exception.lux b/stdlib/test/test/lux/control/exception.lux
index dc768633c..85b331620 100644
--- a/stdlib/test/test/lux/control/exception.lux
+++ b/stdlib/test/test/lux/control/exception.lux
@@ -1,13 +1,16 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                ["&" exception (#+ exception:)])
-       (data ["E" error]
-             [text]
-             text/format
-             [number])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    ["&" exception (#+ exception:)]]
+   [data
+    ["E" error]
+    ["." text
+     format]
+    [number]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (exception: some-exception)
diff --git a/stdlib/test/test/lux/control/interval.lux b/stdlib/test/test/lux/control/interval.lux
index c836dacda..89691a719 100644
--- a/stdlib/test/test/lux/control/interval.lux
+++ b/stdlib/test/test/lux/control/interval.lux
@@ -1,15 +1,20 @@
 (.module:
-  lux
   lux/test
-  (lux (control ["M" monad (#+ do Monad)]
-                pipe
-                ["&" interval])
-       [io]
-       ["r" math/random]
-       (data text/format
-             [number]
-             (collection ["S" set]
-                         ["L" list]))))
+  [lux #*
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe
+    ["&" interval]]
+   [io]
+   [math
+    ["r" random]]
+   [data
+    [number]
+    [text
+     format]
+    [collection
+     ["S" set]
+     ["L" list]]]])
 
 (context: "Equivalence."
   (<| (times +100)
diff --git a/stdlib/test/test/lux/control/parser.lux b/stdlib/test/test/lux/control/parser.lux
index 805ec3126..a8ec24446 100644
--- a/stdlib/test/test/lux/control/parser.lux
+++ b/stdlib/test/test/lux/control/parser.lux
@@ -1,14 +1,17 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do)]
-                [equivalence (#+ Equivalence)]
-                ["&" parser])
-       (data [error (#+ Error)])
-       ["r" math/random]
-       [macro]
-       (macro [code]
-              ["s" syntax (#+ syntax:)]))
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do)]
+    [equivalence (#+ Equivalence)]
+    ["&" parser]]
+   [data
+    [error (#+ Error)]]
+   [math
+    ["r" random]]
+   ["." macro
+    [code]
+    ["s" syntax (#+ syntax:)]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/control/pipe.lux b/stdlib/test/test/lux/control/pipe.lux
index 317501109..6e232a255 100644
--- a/stdlib/test/test/lux/control/pipe.lux
+++ b/stdlib/test/test/lux/control/pipe.lux
@@ -1,14 +1,17 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data text/format
-             [number]
-             [product]
-             identity
-             [text ("text/" Equivalence<Text>)])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data
+    [number]
+    [product]
+    identity
+    [text ("text/" Equivalence<Text>)
+     format]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Pipes"
diff --git a/stdlib/test/test/lux/control/reader.lux b/stdlib/test/test/lux/control/reader.lux
index 5259d1e51..bc7905f37 100644
--- a/stdlib/test/test/lux/control/reader.lux
+++ b/stdlib/test/test/lux/control/reader.lux
@@ -1,9 +1,10 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                pipe
-                ["&" reader]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    pipe
+    ["&" reader]]]
   lux/test)
 
 (context: "Readers"
diff --git a/stdlib/test/test/lux/control/region.lux b/stdlib/test/test/lux/control/region.lux
index abfe25985..606be66bf 100644
--- a/stdlib/test/test/lux/control/region.lux
+++ b/stdlib/test/test/lux/control/region.lux
@@ -1,13 +1,17 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do)]
-                ["/" region]
-                [thread (#+ Thread)]
-                ["ex" exception (#+ exception:)])
-       (data ["e" error (#+ Error)]
-             (collection [list])
-             text/format)
-       ["r" math/random])
+  [lux #*
+   [control
+    [monad (#+ do)]
+    ["/" region]
+    [thread (#+ Thread)]
+    ["ex" exception (#+ exception:)]]
+   [data
+    ["e" error (#+ Error)]
+    [text
+     format]
+    [collection [list]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (exception: oops)
diff --git a/stdlib/test/test/lux/control/state.lux b/stdlib/test/test/lux/control/state.lux
index 59f424be3..9f352df48 100644
--- a/stdlib/test/test/lux/control/state.lux
+++ b/stdlib/test/test/lux/control/state.lux
@@ -1,11 +1,14 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                pipe
-                ["&" state])
-       (data [product])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe
+    ["&" state]]
+   [data
+    [product]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: (with-conditions [state output] computation)
diff --git a/stdlib/test/test/lux/control/thread.lux b/stdlib/test/test/lux/control/thread.lux
index f1e9673e3..8c7dcc592 100644
--- a/stdlib/test/test/lux/control/thread.lux
+++ b/stdlib/test/test/lux/control/thread.lux
@@ -1,7 +1,8 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do)]
-                ["/" thread])))
+  [lux #*
+   [control
+    [monad (#+ do)]
+    ["/" thread]]])
 
 (def: _test0_
   Nat
diff --git a/stdlib/test/test/lux/control/writer.lux b/stdlib/test/test/lux/control/writer.lux
index 49d6341e7..6cf50d2bd 100644
--- a/stdlib/test/test/lux/control/writer.lux
+++ b/stdlib/test/test/lux/control/writer.lux
@@ -1,12 +1,14 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                pipe
-                ["&" writer])
-       (data [text ("text/" Equivalence<Text>)]
-             [number]
-             [product]))
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe
+    ["&" writer]]
+   [data
+    [number]
+    [product]
+    [text ("text/" Equivalence<Text>)]]]
   lux/test)
 
 (context: "Writer."
diff --git a/stdlib/test/test/lux/data/bit.lux b/stdlib/test/test/lux/data/bit.lux
index 158c1d218..6d76ac4e2 100644
--- a/stdlib/test/test/lux/data/bit.lux
+++ b/stdlib/test/test/lux/data/bit.lux
@@ -1,10 +1,13 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)])
-       (data ["&" bit]
-             number)
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]]
+   [data
+    ["&" bit]
+    number]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Bitwise operations."
diff --git a/stdlib/test/test/lux/data/bool.lux b/stdlib/test/test/lux/data/bool.lux
index fb5db77df..0413c2632 100644
--- a/stdlib/test/test/lux/data/bool.lux
+++ b/stdlib/test/test/lux/data/bool.lux
@@ -1,9 +1,12 @@
 (.module:
-  lux
-  (lux (control ["M" monad (#+ do Monad)])
-       [io]
-       (data bool)
-       ["r" math/random])
+  [lux #*
+   [control
+    ["M" monad (#+ do Monad)]]
+   [io]
+   [data
+    bool]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Boolean operations."
diff --git a/stdlib/test/test/lux/data/collection/array.lux b/stdlib/test/test/lux/data/collection/array.lux
index 769a7a215..f0f72a14d 100644
--- a/stdlib/test/test/lux/data/collection/array.lux
+++ b/stdlib/test/test/lux/data/collection/array.lux
@@ -1,13 +1,17 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do Monad)]
-                pipe)
-       [io]
-       (data (collection ["@" array]
-                         [list])
-             [number]
-             [maybe])
-       ["r" math/random])
+  [lux #*
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [io]
+   [data
+    [number]
+    [maybe]
+    [collection
+     ["@" array]
+     [list]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: bounded-size
diff --git a/stdlib/test/test/lux/data/collection/bits.lux b/stdlib/test/test/lux/data/collection/bits.lux
index 8e1d672d7..dd53f42eb 100644
--- a/stdlib/test/test/lux/data/collection/bits.lux
+++ b/stdlib/test/test/lux/data/collection/bits.lux
@@ -1,11 +1,15 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do)]
-                [predicate])
-       (data (collection ["/" bits]))
-       ["r" math/random])
+  [lux #*
+   [control
+    [monad (#+ do)]
+    [predicate]]
+   [data
+    [collection
+     ["/" bits]]]
+   [math
+    ["r" random]]]
   lux/test
-  (test (lux (control ["_eq" equivalence]))))
+  [test [lux [control ["_eq" equivalence]]]])
 
 (def: (size min max)
   (-> Nat Nat (r.Random Nat))
diff --git a/stdlib/test/test/lux/data/collection/dictionary.lux b/stdlib/test/test/lux/data/collection/dictionary.lux
index db8c6ef5a..b0ad15d7b 100644
--- a/stdlib/test/test/lux/data/collection/dictionary.lux
+++ b/stdlib/test/test/lux/data/collection/dictionary.lux
@@ -1,15 +1,18 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                ["eq" equivalence])
-       (data [text]
-             text/format
-             [number]
-             [maybe]
-             (collection ["&" dictionary]
-                         [list ("list/" Fold<List> Functor<List>)]))
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    ["eq" equivalence]]
+   [data
+    [number]
+    [maybe]
+    ["." text
+     format]
+    [collection
+     ["&" dictionary]
+     [list ("list/" Fold<List> Functor<List>)]]]
+   ["r" math/random]]
   lux/test)
 
 (context: "Dictionaries."
diff --git a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
index 0c00a18be..4626886e9 100644
--- a/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/test/test/lux/data/collection/dictionary/ordered.lux
@@ -1,15 +1,19 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                [equivalence (#+ Equivalence)])
-       (data [product]
-             [number]
-             (collection ["s" set]
-                         ["dict" dictionary]
-                         (dictionary ["&" ordered])
-                         [list ("list/" Functor<List>)]))
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    [equivalence (#+ Equivalence)]]
+   [data
+    [product]
+    [number]
+    [collection
+     ["s" set]
+     ["dict" dictionary]
+     [dictionary ["&" ordered]]
+     [list ("list/" Functor<List>)]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Dictionary"
diff --git a/stdlib/test/test/lux/data/collection/list.lux b/stdlib/test/test/lux/data/collection/list.lux
index 940273ba1..f7e73ef9b 100644
--- a/stdlib/test/test/lux/data/collection/list.lux
+++ b/stdlib/test/test/lux/data/collection/list.lux
@@ -1,14 +1,17 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data (collection ["&" list])
-             [number]
-             [bool]
-             [product]
-             [maybe])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data [number]
+    [bool]
+    [product]
+    [maybe]
+    [collection
+     ["&" list]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: bounded-size
diff --git a/stdlib/test/test/lux/data/collection/queue.lux b/stdlib/test/test/lux/data/collection/queue.lux
index a28196c8a..ebb730d58 100644
--- a/stdlib/test/test/lux/data/collection/queue.lux
+++ b/stdlib/test/test/lux/data/collection/queue.lux
@@ -1,10 +1,14 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data (collection ["&" queue])
-             [number])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [number]
+    [collection
+     ["&" queue]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Queues"
diff --git a/stdlib/test/test/lux/data/collection/queue/priority.lux b/stdlib/test/test/lux/data/collection/queue/priority.lux
index a6f62a69b..d893fe960 100644
--- a/stdlib/test/test/lux/data/collection/queue/priority.lux
+++ b/stdlib/test/test/lux/data/collection/queue/priority.lux
@@ -1,11 +1,14 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data (collection (queue ["&" priority]))
-             [number]
-             [maybe])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [number]
+    [maybe]
+    [collection [queue ["&" priority]]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: (gen-queue size)
diff --git a/stdlib/test/test/lux/data/collection/row.lux b/stdlib/test/test/lux/data/collection/row.lux
index 8833c75d3..f8850447a 100644
--- a/stdlib/test/test/lux/data/collection/row.lux
+++ b/stdlib/test/test/lux/data/collection/row.lux
@@ -1,12 +1,15 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data (collection ["&" row]
-                         [list ("list/" Fold<List>)])
-             [number]
-             [maybe])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [number]
+    [maybe]
+    [collection ["&" row]
+     [list ("list/" Fold<List>)]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Rows"
diff --git a/stdlib/test/test/lux/data/collection/sequence.lux b/stdlib/test/test/lux/data/collection/sequence.lux
index 48048216f..16b98a90b 100644
--- a/stdlib/test/test/lux/data/collection/sequence.lux
+++ b/stdlib/test/test/lux/data/collection/sequence.lux
@@ -1,15 +1,18 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                comonad)
-       (data [maybe]
-             [text ("text/" Monoid<Text>)]
-             text/format
-             (collection [list]
-                         ["&" sequence])
-             [number ("nat/" Codec<Text,Nat>)])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    comonad]
+   [data
+    [maybe]
+    [number ("nat/" Codec<Text,Nat>)]
+    [text ("text/" Monoid<Text>)
+     format]
+    [collection [list]
+     ["&" sequence]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Sequences"
diff --git a/stdlib/test/test/lux/data/collection/set.lux b/stdlib/test/test/lux/data/collection/set.lux
index 41aaa88ff..43bd48069 100644
--- a/stdlib/test/test/lux/data/collection/set.lux
+++ b/stdlib/test/test/lux/data/collection/set.lux
@@ -1,11 +1,14 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data (collection ["&" set (#+ Set)]
-                         [list])
-             [number])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [number]
+    [collection ["&" set (#+ Set)]
+     [list]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: gen-nat
diff --git a/stdlib/test/test/lux/data/collection/set/ordered.lux b/stdlib/test/test/lux/data/collection/set/ordered.lux
index b99d5c225..97127a3f3 100644
--- a/stdlib/test/test/lux/data/collection/set/ordered.lux
+++ b/stdlib/test/test/lux/data/collection/set/ordered.lux
@@ -1,13 +1,18 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data (collection [set]
-                         (set ["&" ordered])
-                         [list])
-             [number]
-             text/format)
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [number]
+    [text
+     format]
+    [collection
+     ["." set
+      ["&" ordered]]
+     [list]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: gen-nat
diff --git a/stdlib/test/test/lux/data/collection/stack.lux b/stdlib/test/test/lux/data/collection/stack.lux
index faebac246..06e8af547 100644
--- a/stdlib/test/test/lux/data/collection/stack.lux
+++ b/stdlib/test/test/lux/data/collection/stack.lux
@@ -1,9 +1,12 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do)])
-       (data (collection ["&" stack])
-             [maybe])
-       ["r" math/random])
+  [lux #*
+   [control
+    [monad (#+ do)]]
+   [data
+    [maybe]
+    [collection ["&" stack]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: gen-nat
diff --git a/stdlib/test/test/lux/data/collection/tree/rose.lux b/stdlib/test/test/lux/data/collection/tree/rose.lux
index 211e0eb12..ac340cd13 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose.lux
+++ b/stdlib/test/test/lux/data/collection/tree/rose.lux
@@ -1,14 +1,18 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data [product]
-             [number]
-             [text ("text/" Equivalence<Text>)]
-             text/format
-             (collection (tree ["&" rose])
-                         [list ("list/" Functor<List> Fold<List>)]))
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [product]
+    [number]
+    [text ("text/" Equivalence<Text>)
+     format]
+    [collection
+     [tree ["&" rose]]
+     [list ("list/" Functor<List> Fold<List>)]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: gen-tree
diff --git a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
index acd24c2c1..26311fbd1 100644
--- a/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
+++ b/stdlib/test/test/lux/data/collection/tree/rose/zipper.lux
@@ -1,16 +1,21 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data (collection [list ("list/" Fold<List> Functor<List>)]
-                         (tree [rose]
-                               (rose ["&" zipper])))
-             [text]
-             text/format
-             [number]
-             [maybe])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data
+    [number]
+    [maybe]
+    ["." text
+     format]
+    [collection
+     [list ("list/" Fold<List> Functor<List>)]
+     [tree
+      [rose]
+      [rose ["&" zipper]]]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: gen-tree
diff --git a/stdlib/test/test/lux/data/color.lux b/stdlib/test/test/lux/data/color.lux
index 35b0db7d4..797a0336b 100644
--- a/stdlib/test/test/lux/data/color.lux
+++ b/stdlib/test/test/lux/data/color.lux
@@ -1,11 +1,13 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)])
-       (data ["@" color]
-             [number ("frac/" Number<Frac>)])
-       [math]
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]]
+   [data
+    ["@" color]
+    [number ("frac/" Number<Frac>)]]
+   ["." math
+    ["r" random]]]
   lux/test)
 
 (def: color
diff --git a/stdlib/test/test/lux/data/error.lux b/stdlib/test/test/lux/data/error.lux
index 733be1cc6..d86afc20b 100644
--- a/stdlib/test/test/lux/data/error.lux
+++ b/stdlib/test/test/lux/data/error.lux
@@ -1,10 +1,13 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                pipe)
-       (data text/format
-             ["&" error]))
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe]
+   [data
+    ["&" error]
+    [text
+     format]]]
   lux/test)
 
 (context: "Errors"
diff --git a/stdlib/test/test/lux/data/format/json.lux b/stdlib/test/test/lux/data/format/json.lux
index 9929e1567..e3b3c6f66 100644
--- a/stdlib/test/test/lux/data/format/json.lux
+++ b/stdlib/test/test/lux/data/format/json.lux
@@ -1,36 +1,46 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                codec
-                [equivalence (#+ Equivalence)]
-                pipe
-                ["p" parser])
-       (data [text]
-             text/format
-             ["e" error]
-             [bool]
-             [maybe]
-             [number]
-             (format ["@" json])
-             (collection [row (#+ row)]
-                         ["d" dictionary]
-                         [list]))
-       [macro (#+ with-gensyms)]
-       (macro [code]
-              [syntax (#+ syntax:)]
-              [poly (#+ derived:)]
-              [poly/equivalence]
-              [poly/json])
-       (type [unit])
-       ["r" math/random]
-       (time ["ti" instant]
-             ["tda" date]
-             ["tdu" duration])
-       test)
-  (test (lux (time ["_." instant]
-                   ["_." duration]
-                   ["_." date])))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    codec
+    [equivalence (#+ Equivalence)]
+    pipe
+    ["p" parser]]
+   [data
+    ["e" error]
+    [bool]
+    [maybe]
+    [number]
+    ["." text
+     format]
+    [format
+     ["@" json]]
+    [collection
+     [row (#+ row)]
+     ["d" dictionary]
+     [list]]]
+   [macro (#+ with-gensyms)
+    [code]
+    [syntax (#+ syntax:)]
+    [poly (#+ derived:)]
+    [poly/equivalence]
+    [poly/json]]
+   [type
+    [unit]]
+   [math
+    ["r" random]]
+   [time
+    ["ti" instant]
+    ["tda" date]
+    ["tdu" duration]]
+   test]
+  [test
+   [lux
+    [time
+     ["_." instant]
+     ["_." duration]
+     ["_." date]]]]
   )
 
 (def: gen-json
diff --git a/stdlib/test/test/lux/data/format/xml.lux b/stdlib/test/test/lux/data/format/xml.lux
index a96906f88..b757fe7e6 100644
--- a/stdlib/test/test/lux/data/format/xml.lux
+++ b/stdlib/test/test/lux/data/format/xml.lux
@@ -1,20 +1,24 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                ["p" parser]
-                pipe)
-       (data [text ("text/" Equivalence<Text>)]
-             text/format
-             [ident]
-             ["E" error]
-             [maybe]
-             (format ["&" xml])
-             (collection ["dict" dictionary]
-                         [list ("list/" Functor<List>)]))
-       ["r" math/random ("r/" Monad<Random>)]
-       test)
-  )
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    ["p" parser]
+    pipe]
+   [data
+    [ident]
+    ["E" error]
+    [maybe]
+    [text ("text/" Equivalence<Text>)
+     format]
+    [format
+     ["&" xml]]
+    [collection
+     ["dict" dictionary]
+     [list ("list/" Functor<List>)]]]
+   [math
+    ["r" random ("r/" Monad<Random>)]]]
+  lux/test)
 
 (def: char-range
   Text
diff --git a/stdlib/test/test/lux/data/ident.lux b/stdlib/test/test/lux/data/ident.lux
index 57a6e5f4d..0f8133721 100644
--- a/stdlib/test/test/lux/data/ident.lux
+++ b/stdlib/test/test/lux/data/ident.lux
@@ -1,12 +1,14 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data ["&" ident]
-             [text ("text/" Equivalence<Text>)]
-             text/format)
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data
+    ["&" ident]
+    [text ("text/" Equivalence<Text>)
+     format]]
+   [math ["r" random]]]
   lux/test)
 
 (def: (gen-part size)
diff --git a/stdlib/test/test/lux/data/identity.lux b/stdlib/test/test/lux/data/identity.lux
index 7c82d700c..a57a05f4c 100644
--- a/stdlib/test/test/lux/data/identity.lux
+++ b/stdlib/test/test/lux/data/identity.lux
@@ -1,10 +1,12 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                comonad)
-       (data ["&" identity]
-             [text ("text/" Monoid<Text> Equivalence<Text>)]))
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    comonad]
+   [data
+    ["&" identity]
+    [text ("text/" Monoid<Text> Equivalence<Text>)]]]
   lux/test)
 
 (context: "Identity"
diff --git a/stdlib/test/test/lux/data/lazy.lux b/stdlib/test/test/lux/data/lazy.lux
index e6a266b4a..895fa8b1c 100644
--- a/stdlib/test/test/lux/data/lazy.lux
+++ b/stdlib/test/test/lux/data/lazy.lux
@@ -1,9 +1,12 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data ["&" lazy])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    ["&" lazy]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Lazy."
diff --git a/stdlib/test/test/lux/data/maybe.lux b/stdlib/test/test/lux/data/maybe.lux
index 19af6ac6a..4401748cd 100644
--- a/stdlib/test/test/lux/data/maybe.lux
+++ b/stdlib/test/test/lux/data/maybe.lux
@@ -1,11 +1,13 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                pipe)
-       (data ["&" maybe]
-             [text ("text/" Monoid<Text>)]
-             [number]))
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe]
+   [data
+    ["&" maybe]
+    [number]
+    [text ("text/" Monoid<Text>)]]]
   lux/test)
 
 (context: "Maybe"
diff --git a/stdlib/test/test/lux/data/number.lux b/stdlib/test/test/lux/data/number.lux
index e29521e87..cc286dcd5 100644
--- a/stdlib/test/test/lux/data/number.lux
+++ b/stdlib/test/test/lux/data/number.lux
@@ -1,12 +1,15 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                pipe)
-       (data number
-             [text ("text/" Equivalence<Text>)]
-             text/format)
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe]
+   [data
+    number
+    [text ("text/" Equivalence<Text>)
+     format]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (do-template [category rand-gen <Equivalence> <Order>]
diff --git a/stdlib/test/test/lux/data/number/complex.lux b/stdlib/test/test/lux/data/number/complex.lux
index 11601933e..03ec307ff 100644
--- a/stdlib/test/test/lux/data/number/complex.lux
+++ b/stdlib/test/test/lux/data/number/complex.lux
@@ -1,15 +1,19 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data [product]
-             [number ("frac/" Number<Frac>)]
-             ["&" number/complex]
-             text/format
-             (collection [list ("list/" Functor<List>)]))
-       [math]
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data
+    [product]
+    [number ("frac/" Number<Frac>)
+     ["&" complex]]
+    [text
+     format]
+    [collection
+     [list ("list/" Functor<List>)]]]
+   ["." math
+    ["r" random]]]
   lux/test)
 
 (def: margin-of-error Frac 1.0e-9)
diff --git a/stdlib/test/test/lux/data/number/ratio.lux b/stdlib/test/test/lux/data/number/ratio.lux
index f0320a397..0235a78b7 100644
--- a/stdlib/test/test/lux/data/number/ratio.lux
+++ b/stdlib/test/test/lux/data/number/ratio.lux
@@ -1,10 +1,13 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data ["&" number/ratio ("&/" Number<Ratio>)])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data
+    ["&" number/ratio ("&/" Number<Ratio>)]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (def: gen-part
diff --git a/stdlib/test/test/lux/data/product.lux b/stdlib/test/test/lux/data/product.lux
index 309e8e311..440ccf62c 100644
--- a/stdlib/test/test/lux/data/product.lux
+++ b/stdlib/test/test/lux/data/product.lux
@@ -1,6 +1,7 @@
 (.module:
-  lux
-  (lux (data ["@" product]))
+  [lux #*
+   [data
+    ["@" product]]]
   lux/test)
 
 (context: "Products"
diff --git a/stdlib/test/test/lux/data/sum.lux b/stdlib/test/test/lux/data/sum.lux
index 04b295ccf..0cc9e36af 100644
--- a/stdlib/test/test/lux/data/sum.lux
+++ b/stdlib/test/test/lux/data/sum.lux
@@ -1,9 +1,12 @@
 (.module:
-  lux
-  (lux (control pipe)
-       (data sum
-             [text]
-             (collection [list])))
+  [lux #*
+   [control
+    pipe]
+   [data
+    sum
+    [text]
+    [collection
+     [list]]]]
   lux/test)
 
 (context: "Sum operations"
diff --git a/stdlib/test/test/lux/data/text.lux b/stdlib/test/test/lux/data/text.lux
index edd3fa8a6..c75b1bacd 100644
--- a/stdlib/test/test/lux/data/text.lux
+++ b/stdlib/test/test/lux/data/text.lux
@@ -1,13 +1,17 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data ["&" text]
-             text/format
-             [number]
-             (collection [list]))
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data
+    ["&" text
+     format]
+    [number]
+    [collection
+     [list]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 (context: "Size"
diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux
index 81304af36..0d328cb0e 100644
--- a/stdlib/test/test/lux/data/text/format.lux
+++ b/stdlib/test/test/lux/data/text/format.lux
@@ -1,10 +1,12 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data text/format
-             [text]
-             [number]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    ["." text
+     format]
+    [number]]]
   lux/test)
 
 (context: "Formatters"
diff --git a/stdlib/test/test/lux/data/text/lexer.lux b/stdlib/test/test/lux/data/text/lexer.lux
index 36b2eb1d9..25abe3ae4 100644
--- a/stdlib/test/test/lux/data/text/lexer.lux
+++ b/stdlib/test/test/lux/data/text/lexer.lux
@@ -1,15 +1,19 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do Monad)]
-                pipe
-                ["p" parser])
-       [io]
-       (data ["E" error]
-             [text ("text/" Equivalence<Text>)]
-             text/format
-             ["&" text/lexer]
-             (collection [list]))
-       ["r" math/random])
+  [lux #*
+   [control
+    [monad (#+ do Monad)]
+    pipe
+    ["p" parser]]
+   [io]
+   [data
+    ["E" error]
+    [text ("text/" Equivalence<Text>)
+     format
+     ["&" lexer]]
+    [collection
+     [list]]]
+   [math
+    ["r" random]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/data/text/regex.lux b/stdlib/test/test/lux/data/text/regex.lux
index 581a9011f..16970af9c 100644
--- a/stdlib/test/test/lux/data/text/regex.lux
+++ b/stdlib/test/test/lux/data/text/regex.lux
@@ -1,18 +1,21 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe
-                ["p" parser])
-       (data [product]
-             [text ("text/" Equivalence<Text>)]
-             text/format
-             (text [lexer]
-                   ["&" regex]))
-       [macro]
-       (macro [code]
-              ["s" syntax (#+ syntax:)])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe
+    ["p" parser]]
+   [data
+    [product]
+    [text ("text/" Equivalence<Text>)
+     format
+     [lexer]
+     ["&" regex]]]
+   ["." macro
+    [code]
+    ["s" syntax (#+ syntax:)]]
+   [math
+    ["r" random]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/host.js.lux b/stdlib/test/test/lux/host.js.lux
index 8e301bdaa..cba72d0ae 100644
--- a/stdlib/test/test/lux/host.js.lux
+++ b/stdlib/test/test/lux/host.js.lux
@@ -1,10 +1,7 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)])
-       (data text/format)
-       ["&" host]
-       ["r" math/random])
+  [lux #*
+   ["&" host]
+   [math ["r" random]]]
   lux/test)
 
 (context: "JavaScript operations"
diff --git a/stdlib/test/test/lux/host.jvm.lux b/stdlib/test/test/lux/host.jvm.lux
index 13728b438..d5469b9c2 100644
--- a/stdlib/test/test/lux/host.jvm.lux
+++ b/stdlib/test/test/lux/host.jvm.lux
@@ -1,14 +1,16 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data text/format
-             [number]
-             [product]
-             [text ("text/" Equivalence<Text>)])
-       ["&" host (#+ class: interface: object)]
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data
+    [number]
+    [product]
+    [text ("text/" Equivalence<Text>)
+     format]]
+   ["&" host (#+ class: interface: object)]
+   ["r" math/random]]
   lux/test)
 
 (&.import: (java/util/concurrent/Callable a))
diff --git a/stdlib/test/test/lux/io.lux b/stdlib/test/test/lux/io.lux
index 4257f8100..0fb9018a6 100644
--- a/stdlib/test/test/lux/io.lux
+++ b/stdlib/test/test/lux/io.lux
@@ -1,10 +1,12 @@
 (.module:
-  lux
-  (lux ["&" io]
-       (control ["M" monad (#+ do Monad)])
-       (data [text ("text/" Equivalence<Text>)]
-             text/format
-             [number]))
+  [lux #*
+   ["&" io]
+   [control
+    ["M" monad (#+ do Monad)]]
+   [data
+    [number]
+    [text ("text/" Equivalence<Text>)
+     format]]]
   lux/test)
 
 (context: "I/O"
diff --git a/stdlib/test/test/lux/language/compiler/analysis/case.lux b/stdlib/test/test/lux/language/compiler/analysis/case.lux
index a2d54df8a..66b1b0b12 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/case.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/case.lux
@@ -1,25 +1,32 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                pipe)
-       (data [product]
-             [maybe]
-             [text ("text/" Equivalence<Text>)]
-             (collection [list ("list/" Monad<List>)]
-                         [set]))
-       ["r" math/random ("random/" Monad<Random>)]
-       [macro (#+ Monad<Meta>)]
-       (macro [code])
-       (language [type]
-                 (type ["tc" check])
-                 [".L" module]
-                 (compiler [analysis]
-                           (analysis [".A" type]
-                                     ["/" case])))
-       test)
-  (// ["_." primitive]
-      ["_." structure]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    pipe]
+   [data
+    [product]
+    [maybe]
+    [text ("text/" Equivalence<Text>)]
+    [collection
+     [list ("list/" Monad<List>)]
+     [set]]]
+   [math
+    ["r" random ("random/" Monad<Random>)]]
+   [macro (#+ Monad<Meta>)
+    [code]]
+   [language
+    ["." type
+     ["tc" check]]
+    [".L" module]
+    [compiler
+     ["." analysis
+      [".A" type]
+      ["/" case]]]]
+   test]
+  [//
+   ["_." primitive]
+   ["_." structure]])
 
 (def: (exhaustive-weaving branchings)
   (-> (List (List Code)) (List (List Code)))
diff --git a/stdlib/test/test/lux/language/compiler/analysis/function.lux b/stdlib/test/test/lux/language/compiler/analysis/function.lux
index 3de93fcc7..bc1a24811 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/function.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/function.lux
@@ -1,28 +1,35 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                pipe)
-       (data ["e" error]
-             [maybe]
-             [product]
-             [text ("text/" Equivalence<Text>)]
-             text/format
-             (collection [list ("list/" Functor<List>)]))
-       ["r" math/random]
-       [macro]
-       (macro [code])
-       [language]
-       (language [type ("type/" Equivalence<Type>)]
-                 [".L" reference]
-                 (compiler [".L" init]
-                           [".L" analysis (#+ Analysis)]
-                           (analysis [".A" type]
-                                     [".A" expression]
-                                     ["/" function])))
-       test)
-  (// ["_." primitive]
-      ["_." structure]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    pipe]
+   [data
+    ["e" error]
+    [maybe]
+    [product]
+    [text ("text/" Equivalence<Text>)
+     format]
+    [collection
+     [list ("list/" Functor<List>)]]]
+   [math
+    ["r" random]]
+   ["." macro
+    [code]]
+   [language]
+   [language
+    [type ("type/" Equivalence<Type>)]
+    [".L" reference]
+    [compiler
+     [".L" init]
+     [".L" analysis (#+ Analysis)
+      [".A" type]
+      [".A" expression]
+      ["/" function]]]]
+   test]
+  [//
+   ["_." primitive]
+   ["_." structure]])
 
 (def: analyse (expressionA.analyser (:coerce language.Eval [])))
 
diff --git a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
index 1643786e3..ba841fbfe 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/primitive.lux
@@ -1,21 +1,25 @@
 (.module:
-  [lux (#- primitive)]
-  (lux [io]
-       (control [monad (#+ do)]
-                pipe
-                ["ex" exception (#+ exception:)])
-       (data (text format)
-             ["e" error])
-       ["r" math/random ("random/" Monad<Random>)]
-       [macro]
-       (macro [code])
-       [language]
-       (language [".L" type ("type/" Equivalence<Type>)]
-                 (compiler [".L" init]
-                           [analysis (#+ Analysis)]
-                           (analysis [".A" type]
-                                     [".A" expression])))
-       test))
+  [lux (#- primitive)
+   [io]
+   [control
+    [monad (#+ do)]
+    pipe
+    ["ex" exception (#+ exception:)]]
+   [data
+    ["e" error]
+    [text format]]
+   [math
+    ["r" random ("random/" Monad<Random>)]]
+   ["." macro
+    [code]]
+   ["." language
+    [".L" type ("type/" Equivalence<Type>)]
+    [compiler
+     [".L" init]
+     [analysis (#+ Analysis)
+      [".A" type]
+      [".A" expression]]]]
+   test])
 
 (def: #export analyse (expressionA.analyser (:coerce language.Eval [])))
 
diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
index ea7d8bdc2..59d1d955a 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/common.lux
@@ -1,23 +1,30 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                pipe)
-       (concurrency [atom])
-       (data text/format
-             ["e" error]
-             [product]
-             (collection [array]))
-       ["r" math/random]
-       [macro (#+ Monad<Meta>)]
-       (macro [code])
-       [language]
-       (language [type ("type/" Equivalence<Type>)]
-                 [".L" scope]
-                 (compiler [".L" init]
-                           (analysis [".A" type])))
-       test)
-  (/// ["_." primitive]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    pipe]
+   [concurrency
+    [atom]]
+   [data
+    ["e" error]
+    [product]
+    [text format]
+    [collection [array]]]
+   [math
+    ["r" random]]
+   [macro (#+ Monad<Meta>)
+    [code]]
+   ["." language
+    [type ("type/" Equivalence<Type>)]
+    [".L" scope]
+    [compiler
+     [".L" init]
+     [analysis
+      [".A" type]]]]
+   test]
+  [///
+   ["_." primitive]])
 
 (do-template [<name> <success> <failure>]
   [(def: (<name> procedure params output-type)
diff --git a/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
index d33af651d..02574a31a 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/procedure/host.jvm.lux
@@ -1,27 +1,37 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                pipe)
-       (concurrency [atom])
-       (data ["e" error]
-             [product]
-             [maybe]
-             [text ("text/" Equivalence<Text>)]
-             text/format
-             (collection [array]
-                         [list ("list/" Fold<List>)]
-                         ["dict" dictionary]))
-       ["r" math/random "r/" Monad<Random>]
-       [macro (#+ Monad<Meta>)]
-       (macro [code])
-       [language]
-       (language [type]
-                 (compiler [".L" init]
-                           (analysis [".A" type])
-                           (extension (analysis [".AE" host]))))
-       test)
-  (/// ["_." primitive]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    pipe]
+   [concurrency
+    [atom]]
+   [data
+    ["e" error]
+    [product]
+    [maybe]
+    [text ("text/" Equivalence<Text>)
+     format]
+    [collection
+     [array]
+     [list ("list/" Fold<List>)]
+     ["dict" dictionary]]]
+   [math
+    ["r" random "r/" Monad<Random>]]
+   [macro (#+ Monad<Meta>)
+    [code]]
+   ["." language
+    [type]
+    [compiler
+     [".L" init]
+     [analysis
+      [".A" type]]
+     [extension
+      [analysis
+       [".AE" host]]]]]
+   test]
+  [///
+   ["_." primitive]])
 
 (do-template [<name> <success> <failure>]
   [(def: (<name> procedure params output-type)
diff --git a/stdlib/test/test/lux/language/compiler/analysis/reference.lux b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
index 413a8fb01..aaad40584 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/reference.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/reference.lux
@@ -1,25 +1,30 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                pipe)
-       (data ["e" error]
-             [ident ("ident/" Equivalence<Ident>)]
-             [text ("text/" Equivalence<Text>)])
-       ["r" math/random]
-       [macro (#+ Monad<Meta>)]
-       (macro [code])
-       [language]
-       (language [type ("type/" Equivalence<Type>)]
-                 [".L" scope]
-                 [".L" module]
-                 [".L" reference]
-                 (compiler [".L" init]
-                           [".L" analysis]
-                           (analysis [".A" type]
-                                     [".A" expression])))
-       test)
-  (// ["_." primitive]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    pipe]
+   [data
+    ["e" error]
+    [ident ("ident/" Equivalence<Ident>)]
+    [text ("text/" Equivalence<Text>)]]
+   [math
+    ["r" random]]
+   [macro (#+ Monad<Meta>) [code]]
+   ["." language]
+   [language
+    [type ("type/" Equivalence<Type>)]
+    [".L" scope]
+    [".L" module]
+    [".L" reference]
+    [compiler
+     [".L" init]
+     [".L" analysis
+      [".A" type]
+      [".A" expression]]]]
+   test]
+  [//
+   ["_." primitive]])
 
 (def: analyse (expressionA.analyser (:coerce language.Eval [])))
 
diff --git a/stdlib/test/test/lux/language/compiler/analysis/structure.lux b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
index dca02794d..2777ad93b 100644
--- a/stdlib/test/test/lux/language/compiler/analysis/structure.lux
+++ b/stdlib/test/test/lux/language/compiler/analysis/structure.lux
@@ -1,30 +1,36 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                pipe)
-       (data [bool ("bool/" Equivalence<Bool>)]
-             ["e" error]
-             [product]
-             [maybe]
-             [text]
-             text/format
-             (collection [list ("list/" Functor<List>)]
-                         [set]))
-       ["r" math/random]
-       [macro]
-       (macro [code])
-       [language]
-       (language [type ("type/" Equivalence<Type>)]
-                 (type ["tc" check])
-                 [".L" module]
-                 (compiler [".L" init]
-                           [".L" analysis (#+ Analysis Variant Tag)]
-                           (analysis [".A" type]
-                                     ["/" structure]
-                                     [".A" expression])))
-       test)
-  (// ["_." primitive]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    pipe]
+   [data
+    [bool ("bool/" Equivalence<Bool>)]
+    ["e" error]
+    [product]
+    [maybe]
+    ["." text
+     format]
+    [collection
+     [list ("list/" Functor<List>)]
+     [set]]]
+   [math
+    ["r" random]]
+   ["." macro
+    [code]]
+   ["." language
+    [type ("type/" Equivalence<Type>)
+     ["tc" check]]
+    [".L" module]
+    [compiler
+     [".L" init]
+     [".L" analysis (#+ Analysis Variant Tag)
+      [".A" type]
+      ["/" structure]
+      [".A" expression]]]]
+   test]
+  [//
+   ["_." primitive]])
 
 (def: analyse (expressionA.analyser (:coerce language.Eval [])))
 
diff --git a/stdlib/test/test/lux/language/syntax.lux b/stdlib/test/test/lux/language/syntax.lux
index 2a6e9ae5d..22420e3eb 100644
--- a/stdlib/test/test/lux/language/syntax.lux
+++ b/stdlib/test/test/lux/language/syntax.lux
@@ -1,18 +1,22 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)])
-       (data [number]
-             ["e" error]
-             [text]
-             (text format
-                   ["l" lexer])
-             (collection [list]
-                         ["dict" dictionary (#+ Dictionary)]))
-       ["r" math/random ("r/" Monad<Random>)]
-       (macro [code])
-       (language ["&" syntax])
-       test))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]]
+   [data
+    [number]
+    ["e" error]
+    ["." text
+     format
+     ["l" lexer]]
+    [collection
+     [list]
+     ["dict" dictionary (#+ Dictionary)]]]
+   [math
+    ["r" random ("r/" Monad<Random>)]]
+   [macro [code]]
+   [language ["&" syntax]]
+   test])
 
 (def: default-cursor
   Cursor
diff --git a/stdlib/test/test/lux/language/type.lux b/stdlib/test/test/lux/language/type.lux
index ccc315487..7be06000b 100644
--- a/stdlib/test/test/lux/language/type.lux
+++ b/stdlib/test/test/lux/language/type.lux
@@ -1,13 +1,19 @@
 (.module:
-  lux
-  (lux [io]
-       (control ["M" monad (#+ do Monad)]
-                pipe)
-       (data text/format
-             [maybe]
-             (collection [list]))
-       ["r" math/random]
-       (language ["&" type]))
+  [lux #*
+   [io]
+   [control
+    ["M" monad (#+ do Monad)]
+    pipe]
+   [data
+    [maybe]
+    [text
+     format]
+    [collection
+     [list]]]
+   [math
+    ["r" random]]
+   [language
+    ["&" type]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/language/type/check.lux b/stdlib/test/test/lux/language/type/check.lux
index bc04f461b..8fe7f2bf6 100644
--- a/stdlib/test/test/lux/language/type/check.lux
+++ b/stdlib/test/test/lux/language/type/check.lux
@@ -1,18 +1,23 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                [pipe (#+ case>)])
-       (data [product]
-             [maybe]
-             [number]
-             [text ("text/" Monoid<Text> Equivalence<Text>)]
-             text/format
-             (collection [list ("list/" Functor<List>)]
-                         [set]))
-       ["r" math/random]
-       (language [type ("type/" Equivalence<Type>)]
-                 (type ["@" check])))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    [pipe (#+ case>)]]
+   [data
+    [product]
+    [maybe]
+    [number]
+    [text ("text/" Monoid<Text> Equivalence<Text>)
+     format]
+    [collection
+     [list ("list/" Functor<List>)]
+     [set]]]
+   [math
+    ["r" random]]
+   [language
+    [type ("type/" Equivalence<Type>)
+     ["@" check]]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/macro/code.lux b/stdlib/test/test/lux/macro/code.lux
index d1c7eb318..6c5a28265 100644
--- a/stdlib/test/test/lux/macro/code.lux
+++ b/stdlib/test/test/lux/macro/code.lux
@@ -1,12 +1,14 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data [text ("text/" Equivalence<Text>)]
-             text/format
-             [number])
-       ["r" math/random]
-       (macro ["&" code]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [number]
+    [text ("text/" Equivalence<Text>)
+     format]]
+   [math ["r" random]]
+   [macro ["&" code]]]
   lux/test)
 
 (context: "Code"
diff --git a/stdlib/test/test/lux/macro/poly/equivalence.lux b/stdlib/test/test/lux/macro/poly/equivalence.lux
index 30b41c6b0..3ae57cd40 100644
--- a/stdlib/test/test/lux/macro/poly/equivalence.lux
+++ b/stdlib/test/test/lux/macro/poly/equivalence.lux
@@ -1,18 +1,21 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                [equivalence (#+ Equivalence)])
-       (data text/format
-             [bool]
-             [number ("int/" Number<Int>)]
-             [text]
-             [maybe]
-             (collection [list]))
-       ["r" math/random]
-       [macro]
-       (macro [poly (#+ derived:)]
-              ["&" poly/equivalence]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    [equivalence (#+ Equivalence)]]
+   [data
+    [bool]
+    [maybe]
+    [number ("int/" Number<Int>)]
+    ["." text
+     format]
+    [collection [list]]]
+   [math
+    ["r" random]]
+   ["." macro
+    [poly (#+ derived:)]
+    ["&" poly/equivalence]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/macro/poly/functor.lux b/stdlib/test/test/lux/macro/poly/functor.lux
index 0b92743e2..6d335701e 100644
--- a/stdlib/test/test/lux/macro/poly/functor.lux
+++ b/stdlib/test/test/lux/macro/poly/functor.lux
@@ -1,9 +1,12 @@
 (.module:
-  lux
-  (lux (control [state])
-       (data [identity])
-       (macro [poly (#+ derived:)]
-              ["&" poly/functor]))
+  [lux #*
+   [control
+    [state]]
+   [data
+    [identity]]
+   [macro
+    [poly (#+ derived:)]
+    ["&" poly/functor]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/macro/syntax.lux b/stdlib/test/test/lux/macro/syntax.lux
index 2b1fa4962..8d2b5ff8c 100644
--- a/stdlib/test/test/lux/macro/syntax.lux
+++ b/stdlib/test/test/lux/macro/syntax.lux
@@ -1,19 +1,22 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                [equivalence (#+ Equivalence)]
-                ["p" parser])
-       (data [text]
-             text/format
-             [number]
-             [bool]
-             [ident]
-             ["e" error])
-       ["r" math/random]
-       [macro]
-       (macro [code]
-              ["s" syntax (#+ syntax: Syntax)]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    [equivalence (#+ Equivalence)]
+    ["p" parser]]
+   [data
+    [bool]
+    [ident]
+    ["e" error]
+    [number]
+    ["." text
+     format]]
+   [math
+    ["r" random]]
+   ["." macro
+    [code]
+    ["s" syntax (#+ syntax: Syntax)]]]
   lux/test)
 
 ## [Utils]
diff --git a/stdlib/test/test/lux/math.lux b/stdlib/test/test/lux/math.lux
index 2d13430ed..ab12c4894 100644
--- a/stdlib/test/test/lux/math.lux
+++ b/stdlib/test/test/lux/math.lux
@@ -1,11 +1,13 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data [bool ("bool/" Equivalence<Bool>)]
-             [number ("frac/" Number<Frac>)])
-       ["r" math/random]
-       ["&" math])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [bool ("bool/" Equivalence<Bool>)]
+    [number ("frac/" Number<Frac>)]]
+   ["&" math
+    ["r" random]]]
   lux/test)
 
 (def: (within? margin-of-error standard value)
diff --git a/stdlib/test/test/lux/math/logic/continuous.lux b/stdlib/test/test/lux/math/logic/continuous.lux
index 8962fc0a2..4dc768cc2 100644
--- a/stdlib/test/test/lux/math/logic/continuous.lux
+++ b/stdlib/test/test/lux/math/logic/continuous.lux
@@ -1,9 +1,12 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do)])
-       [io]
-       ["r" math/random]
-       ["&" math/logic/continuous])
+  [lux #*
+   [control
+    [monad (#+ do)]]
+   [io]
+   [math
+    ["r" random]
+    [logic
+     ["&" continuous]]]]
   lux/test)
 
 (context: "Operations"
diff --git a/stdlib/test/test/lux/math/logic/fuzzy.lux b/stdlib/test/test/lux/math/logic/fuzzy.lux
index 2c88469ce..53e183b35 100644
--- a/stdlib/test/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/test/test/lux/math/logic/fuzzy.lux
@@ -1,15 +1,21 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data (collection [list]
-                         [set])
-             [bool ("bool/" Equivalence<Bool>)]
-             [number]
-             text/format)
-       ["r" math/random]
-       (math/logic ["&" fuzzy]
-                   continuous))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [bool ("bool/" Equivalence<Bool>)]
+    [number]
+    [text
+     format]
+    [collection
+     [list]
+     [set]]]
+   [math
+    ["r" random]
+    [logic
+     ["&" fuzzy]
+     continuous]]]
   lux/test)
 
 (do-template [<desc> <hash> <gen> <triangle> <lt> <lte> <gt> <gte>]
diff --git a/stdlib/test/test/lux/math/modular.lux b/stdlib/test/test/lux/math/modular.lux
index afa6330d3..89e2e94a3 100644
--- a/stdlib/test/test/lux/math/modular.lux
+++ b/stdlib/test/test/lux/math/modular.lux
@@ -1,13 +1,17 @@
 (.module:
-  lux
-  (lux (control [monad (#+ do)])
-       (data [product]
-             [bool ("bool/" Equivalence<Bool>)]
-             ["e" error]
-             text/format)
-       (math ["r" random]
-             ["/" modular])
-       (language [type ("type/" Equivalence<Type>)]))
+  [lux #*
+   [control
+    [monad (#+ do)]]
+   [data
+    [product]
+    [bool ("bool/" Equivalence<Bool>)]
+    ["e" error]
+    [text
+     format]]
+   [math
+    ["r" random]
+    ["/" modular]]
+   [language [type ("type/" Equivalence<Type>)]]]
   lux/test)
 
 (def: %3 (/.modulus 3))
diff --git a/stdlib/test/test/lux/math/random.lux b/stdlib/test/test/lux/math/random.lux
index aa574511b..2785666e0 100644
--- a/stdlib/test/test/lux/math/random.lux
+++ b/stdlib/test/test/lux/math/random.lux
@@ -1,17 +1,20 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data [number]
-             text/format
-             (collection [list]
-                         [row]
-                         [array]
-                         [queue]
-                         [stack]
-                         [set]
-                         ["dict" dictionary]))
-       (math ["r" random]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    [number]
+    [text format]
+    [collection
+     [list]
+     [row]
+     [array]
+     [queue]
+     [stack]
+     [set]
+     ["dict" dictionary]]]
+   [math ["r" random]]]
   lux/test)
 
 (context: "Random."
diff --git a/stdlib/test/test/lux/time/date.lux b/stdlib/test/test/lux/time/date.lux
index 93238bc11..9f70e738f 100644
--- a/stdlib/test/test/lux/time/date.lux
+++ b/stdlib/test/test/lux/time/date.lux
@@ -1,14 +1,18 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                [pipe])
-       (data [error])
-       (math ["r" random ("random/" Monad<Random>)])
-       (time ["@." instant]
-             ["@" date]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    [pipe]]
+   [data
+    [error]]
+   [math
+    ["r" random ("random/" Monad<Random>)]]
+   [time
+    ["@." instant]
+    ["@" date]]]
   lux/test
-  (test (lux (time ["_." instant]))))
+  [test [lux [time ["_." instant]]]])
 
 (def: month
   (r.Random @.Month)
diff --git a/stdlib/test/test/lux/time/duration.lux b/stdlib/test/test/lux/time/duration.lux
index a15738906..c5896b193 100644
--- a/stdlib/test/test/lux/time/duration.lux
+++ b/stdlib/test/test/lux/time/duration.lux
@@ -1,10 +1,14 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)])
-       (data ["E" error])
-       (math ["r" random])
-       (time ["@" duration]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]]
+   [data
+    ["E" error]]
+   [math
+    ["r" random]]
+   [time
+    ["@" duration]]]
   lux/test)
 
 (def: #export duration
diff --git a/stdlib/test/test/lux/time/instant.lux b/stdlib/test/test/lux/time/instant.lux
index c1e258566..6914bd7b0 100644
--- a/stdlib/test/test/lux/time/instant.lux
+++ b/stdlib/test/test/lux/time/instant.lux
@@ -1,17 +1,22 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do Monad)]
-                pipe)
-       (data [text]
-             text/format
-             [error])
-       (math ["r" random])
-       (time ["@" instant]
-             ["@d" duration]
-             ["@date" date]))
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do Monad)]
+    pipe]
+   [data
+    ["." text
+     format]
+    [error]]
+   [math
+    ["r" random]]
+   [time
+    ["@" instant]
+    ["@d" duration]
+    ["@date" date]]]
   lux/test
-  (// ["_." duration]))
+  [//
+   ["_." duration]])
 
 (def: boundary Int 99_999_999_999_999)
 
diff --git a/stdlib/test/test/lux/type/implicit.lux b/stdlib/test/test/lux/type/implicit.lux
index 680241dde..e19f672e0 100644
--- a/stdlib/test/test/lux/type/implicit.lux
+++ b/stdlib/test/test/lux/type/implicit.lux
@@ -1,14 +1,17 @@
 (.module:
-  lux
-  (lux [io]
-       (control [equivalence]
-                [functor]
-                [monad (#+ do Monad)])
-       (data [number]
-             [bool ("bool/" Equivalence<Bool>)]
-             (collection [list]))
-       ["r" math/random]
-       (type implicit))
+  [lux #*
+   [io]
+   [control
+    [equivalence]
+    [functor]
+    [monad (#+ do Monad)]]
+   [data
+    [bool ("bool/" Equivalence<Bool>)]
+    [number]
+    [collection [list]]]
+   [math
+    ["r" random]]
+   [type implicit]]
   lux/test)
 
 (context: "Automatic structure selection"
diff --git a/stdlib/test/test/lux/type/object/interface.lux b/stdlib/test/test/lux/type/object/interface.lux
index e7afc5f64..6cc1eb4b0 100644
--- a/stdlib/test/test/lux/type/object/interface.lux
+++ b/stdlib/test/test/lux/type/object/interface.lux
@@ -1,7 +1,11 @@
 (.module:
-  lux
-  (lux (data (collection [list]))
-       (type (object interface))))
+  [lux #*
+   [data
+    [collection
+     [list]]]
+   [type
+    [object
+     interface]]])
 
 ## No parameters
 (interface: Counter
diff --git a/stdlib/test/test/lux/type/object/protocol.lux b/stdlib/test/test/lux/type/object/protocol.lux
index 58e4f6fcd..0ec93442b 100644
--- a/stdlib/test/test/lux/type/object/protocol.lux
+++ b/stdlib/test/test/lux/type/object/protocol.lux
@@ -1,7 +1,11 @@
 (.module:
-  lux
-  (lux (data text/format)
-       (type (object protocol))))
+  [lux #*
+   [data
+    [text
+     format]]
+   [type
+    [object
+     protocol]]])
 
 (type: Counter (Object (Method Any Nat)))
 
diff --git a/stdlib/test/test/lux/type/resource.lux b/stdlib/test/test/lux/type/resource.lux
index 9024975e2..7a9940499 100644
--- a/stdlib/test/test/lux/type/resource.lux
+++ b/stdlib/test/test/lux/type/resource.lux
@@ -1,9 +1,12 @@
 (.module:
-  lux
-  (lux (control (monad [indexed (#+ do)]))
-       [macro]
-       (type [resource (#+ Res)])
-       [io])
+  [lux #*
+   [control
+    [monad
+     [indexed (#+ do)]]]
+   [macro]
+   [type
+    [resource (#+ Res)]]
+   [io]]
   lux/test)
 
 (context: "Sub-structural typing."
diff --git a/stdlib/test/test/lux/world/blob.lux b/stdlib/test/test/lux/world/blob.lux
index 2adc116c3..7bce91298 100644
--- a/stdlib/test/test/lux/world/blob.lux
+++ b/stdlib/test/test/lux/world/blob.lux
@@ -1,16 +1,23 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                [pipe])
-       (data [bit]
-             [number]
-             ["e" error]
-             (collection [list]))
-       (world ["/" blob])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    [pipe]]
+   [data
+    [bit]
+    [number]
+    ["e" error]
+    [collection [list]]]
+   [world
+    ["/" blob]]
+   [math
+    ["r" random]]]
   lux/test
-  (test (lux (control ["_eq" equivalence]))))
+  [test
+   [lux
+    [control
+     ["_eq" equivalence]]]])
 
 (def: (succeed result)
   (-> (e.Error Bool) Bool)
diff --git a/stdlib/test/test/lux/world/file.lux b/stdlib/test/test/lux/world/file.lux
index bd6ff9294..6f508baaa 100644
--- a/stdlib/test/test/lux/world/file.lux
+++ b/stdlib/test/test/lux/world/file.lux
@@ -1,19 +1,26 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)])
-       (concurrency [promise])
-       (data [error]
-             [text]
-             text/format
-             [number])
-       (time [instant]
-             [duration])
-       (world ["@" file]
-              [blob])
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]]
+   [concurrency
+    [promise]]
+   [data
+    [error]
+    [number]
+    ["." text
+     format]]
+   [time
+    [instant]
+    [duration]]
+   [world
+    ["@" file]
+    [blob]]
+   [math
+    ["r" random]]]
   lux/test
-  (// ["_." blob]))
+  [//
+   ["_." blob]])
 
 (def: truncate-millis
   (|>> (i// 1_000) (i/* 1_000)))
diff --git a/stdlib/test/test/lux/world/net/tcp.lux b/stdlib/test/test/lux/world/net/tcp.lux
index 7277a5b1c..26b7703ea 100644
--- a/stdlib/test/test/lux/world/net/tcp.lux
+++ b/stdlib/test/test/lux/world/net/tcp.lux
@@ -1,20 +1,26 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                ["ex" exception (#+ exception:)])
-       (concurrency ["P" promise]
-                    ["T" task]
-                    [frp ("frp/" Functor<Channel>)])
-       (data ["E" error]
-             [text]
-             text/format)
-       (world [blob]
-              [net]
-              (net ["@" tcp]))
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    ["ex" exception (#+ exception:)]]
+   [concurrency
+    ["P" promise]
+    ["T" task]
+    [frp ("frp/" Functor<Channel>)]]
+   [data
+    ["E" error]
+    ["." text
+     format]]
+   [world
+    [blob]
+    ["." net
+     ["@" tcp]]]
+   [math
+    ["r" random]]]
   lux/test
-  (/// ["_." blob]))
+  [///
+   ["_." blob]])
 
 (def: localhost net.Address "127.0.0.1")
 (def: port
diff --git a/stdlib/test/test/lux/world/net/udp.lux b/stdlib/test/test/lux/world/net/udp.lux
index 53c2f9d88..b1685ebc7 100644
--- a/stdlib/test/test/lux/world/net/udp.lux
+++ b/stdlib/test/test/lux/world/net/udp.lux
@@ -1,20 +1,26 @@
 (.module:
-  lux
-  (lux [io]
-       (control [monad (#+ do)]
-                ["ex" exception (#+ exception:)])
-       (concurrency ["P" promise]
-                    ["T" task]
-                    [frp])
-       (data ["E" error]
-             [text]
-             text/format)
-       (world [blob]
-              [net]
-              (net ["@" udp]))
-       ["r" math/random])
+  [lux #*
+   [io]
+   [control
+    [monad (#+ do)]
+    ["ex" exception (#+ exception:)]]
+   [concurrency
+    ["P" promise]
+    ["T" task]
+    [frp]]
+   [data
+    ["E" error]
+    ["." text
+     format]]
+   [world
+    [blob]
+    ["." net
+     ["@" udp]]]
+   [math
+    ["r" random]]]
   lux/test
-  (/// ["_." blob]))
+  [///
+   ["_." blob]])
 
 (def: localhost net.Address "127.0.0.1")
 (def: port
diff --git a/stdlib/test/tests.lux b/stdlib/test/tests.lux
index 8d644b68e..baa1c6f54 100644
--- a/stdlib/test/tests.lux
+++ b/stdlib/test/tests.lux
@@ -1,140 +1,174 @@
 (.module:
-  lux
-  (lux [cli (#+ program:)]
-       [test])
-  (test ["_." lux]
-        (lux ["_." cli]
-             ["_." host]
-             ["_." io]
-             (time ["_." instant]
-                   ["_." duration]
-                   ["_." date])
-             (concurrency ["_." actor]
-                          ["_." atom]
-                          ["_." frp]
-                          ["_." promise]
-                          ["_." stm]
-                          ["_." semaphore])
-             (control ["_." exception]
-                      ["_." interval]
-                      ["_." pipe]
-                      ["_." continuation]
-                      ["_." reader]
-                      ["_." writer]
-                      ["_." state]
-                      ["_." parser]
-                      ["_." thread]
-                      ["_." region])
-             (data ["_." bit]
-                   ["_." bool]
-                   ["_." color]
-                   ["_." error]
-                   ["_." ident]
-                   ["_." identity]
-                   ["_." lazy]
-                   ["_." maybe]
-                   ["_." product]
-                   ["_." sum]
-                   ## ["_." number] ## Specially troublesome...
-                   (number ["_." ratio]
-                           ["_." complex])
-                   ["_." text]
-                   (text ["_." format]
-                         ["_." lexer]
-                         ["_." regex])
-                   (format ["_." json]
-                           ["_." xml])
-                   (collection ["_." array]
-                               ["_." bits]
-                               ["_." list]
-                               ["_." stack]
-                               ["_." row]
-                               ["_." sequence]
-                               ["_." dictionary]
-                               (dictionary ["_.D" ordered])
-                               ["_." set]
-                               (set ["_.S" ordered])
-                               ["_." queue]
-                               (queue ["_." priority])
-                               (tree ["_." rose]
-                                     (rose ["_." zipper]))))
-             ["_." math]
-             (math ["_." random]
-                   ["_." modular]
-                   (logic ["_." continuous]
-                          ["_." fuzzy]))
-             (macro ["_." code]
-                    ["_." syntax]
-                    (poly ["poly_." equivalence]
-                          ["poly_." functor]))
-             (type ## ["_." implicit] ## Specially troublesome...
-                   ["_." resource]
-              (object
-                ["_." interface]
-                ["_." protocol]))
-             (language ["_language/." syntax]
-                       ["_." type]
-                       (type ["_." check])
-                       (compiler (analysis ["_.A" primitive]
-                                           ["_.A" structure]
-                                           ["_.A" reference]
-                                           ["_.A" case]
-                                           ["_.A" function]
-                                           ## (procedure ["_.A" common]
-                                           ##            ["_.A" host])
-                                           )
-                                 ## (synthesis ["_.S" primitive]
-                                 ##            ["_.S" structure]
-                                 ##            ["_.S" case]
-                                 ##            ["_.S" function])
-                                 )
-                       )
-             (world ["_." blob]
-                    ## ["_." file] ## Specially troublesome...
-                    (net ["_." tcp]
-                         ["_." udp]))
-             ))
-  (lux (control [contract]
-                [concatenative]
-                [predicate]
-                [monad/free])
-       (data [env]
-             [trace]
-             [store]
-             [tainted]
-             (format [context]
-                     [html]
-                     [css]
-                     [binary])
-             (collection (tree ["_." rose/parser])
-                         (dictionary [plist])
-                         (set [multi]))
-             (text [buffer]))
-       [macro]
-       (macro (poly [json]))
-       (type [unit]
-             [refinement]
-             [quotient])
-       (world [environment]
-              [console])
-       (language (host [".H" scheme])
-                 (compiler [translation]
-                           (translation (scheme ["._scheme" primitive]
-                                                ["._scheme" structure]
-                                                ["._scheme" reference]
-                                                ["._scheme" function]
-                                                ["._scheme" loop]
-                                                ["._scheme" case]
-                                                ["._scheme" extension]
-                                                ["._scheme" extension/common]
-                                                ["._scheme" expression]))
-                           (default (repl [type]))
-                           (meta [io]
-                                 [io/context]
-                                 [io/archive]
-                                 [archive]
-                                 ["._meta" cache])
-                           (default ["._default" cache]))))
+  [lux #*
+   [cli (#+ program:)]
+   [test]
+   ## TODO: Test these modules
+   [control
+    [contract]
+    [concatenative]
+    [predicate]
+    [monad/free]]
+   [data
+    [env]
+    [trace]
+    [store]
+    [tainted]
+    [format
+     [context]
+     [html]
+     [css]
+     [binary]]
+    [collection
+     [tree ["_." rose/parser]]
+     [dictionary [plist]]
+     [set [multi]]]
+    [text [buffer]]]
+   [macro (#+)
+    [poly [json]]]
+   [type
+    [unit]
+    [refinement]
+    [quotient]]
+   [world
+    [environment]
+    [console]]
+   [language
+    [host [".H" scheme]]
+    [compiler
+     [translation (#+)
+      [scheme
+       ["._scheme" primitive]
+       ["._scheme" structure]
+       ["._scheme" reference]
+       ["._scheme" function]
+       ["._scheme" loop]
+       ["._scheme" case]
+       ["._scheme" extension]
+       ["._scheme" extension/common]
+       ["._scheme" expression]]]
+     [default [repl [type]]]
+     [meta
+      [io]
+      [io/context]
+      [io/archive]
+      [archive]
+      ["._meta" cache]]
+     [default ["._default" cache]]]]]
+  [test
+   ["_." lux]
+   [lux
+    ["_." cli]
+    ["_." host]
+    ["_." io]
+    [time
+     ["_." instant]
+     ["_." duration]
+     ["_." date]]
+    [concurrency
+     ["_." actor]
+     ["_." atom]
+     ["_." frp]
+     ["_." promise]
+     ["_." stm]
+     ["_." semaphore]]
+    [control
+     ["_." exception]
+     ["_." interval]
+     ["_." pipe]
+     ["_." continuation]
+     ["_." reader]
+     ["_." writer]
+     ["_." state]
+     ["_." parser]
+     ["_." thread]
+     ["_." region]]
+    [data
+     ["_." bit]
+     ["_." bool]
+     ["_." color]
+     ["_." error]
+     ["_." ident]
+     ["_." identity]
+     ["_." lazy]
+     ["_." maybe]
+     ["_." product]
+     ["_." sum]
+     ## ["_." number] ## Specially troublesome...
+     [number
+      ["_." ratio]
+      ["_." complex]]
+     ["_." text]
+     [text
+      ["_." format]
+      ["_." lexer]
+      ["_." regex]]
+     [format
+      ["_." json]
+      ["_." xml]]
+     [collection
+      ["_." array]
+      ["_." bits]
+      ["_." list]
+      ["_." stack]
+      ["_." row]
+      ["_." sequence]
+      ["_." dictionary]
+      [dictionary ["_.D" ordered]]
+      ["_." set]
+      [set ["_.S" ordered]]
+      ["_." queue]
+      [queue ["_." priority]]
+      [tree
+       ["_." rose]
+       [rose ["_." zipper]]]]]
+    ["_." math]
+    [math
+     ["_." random]
+     ["_." modular]
+     [logic
+      ["_." continuous]
+      ["_." fuzzy]]]
+    [macro
+     ["_." code]
+     ["_." syntax]
+     [poly
+      ["poly_." equivalence]
+      ["poly_." functor]]]
+    [type
+     ## ["_." implicit] ## Specially troublesome...
+     ["_." resource]
+     [object
+      ["_." interface]
+      ["_." protocol]]]
+    [language
+     ["_language/." syntax]
+     ["_." type]
+     [type ["_." check]]
+     [compiler
+      [analysis
+       ["_.A" primitive]
+       ["_.A" structure]
+       ["_.A" reference]
+       ["_.A" case]
+       ["_.A" function]
+       ## [procedure
+       ##  ["_.A" common]
+       ##  ["_.A" host]]
+       ]
+      ## [synthesis
+      ##  ["_.S" primitive]
+      ##  ["_.S" structure]
+      ##  ["_.S" case]
+      ##  ["_.S" function]]
+      ]
+     ]
+    [world
+     ["_." blob]
+     ## ["_." file] ## Specially troublesome...
+     [net
+      ["_." tcp]
+      ["_." udp]]]
+    ]]
   )
 
 (program: args