Extensible import syntax: Part 1

42 files changed, 193 insertions, 193 deletions

diff --git a/stdlib/source/test/lux/control.lux b/stdlib/source/test/lux/control.lux
index bbb3d869d..3761a6e11 100644
--- a/stdlib/source/test/lux/control.lux
+++ b/stdlib/source/test/lux/control.lux
@@ -1,7 +1,7 @@
 (.using
  [library
   [lux {"-" function}
-   ["_" test {"+" Test}]]]
+   ["_" test (.only Test)]]]
  ["[0]" / "_"
   ["[1][0]" concatenative]
   ["[1][0]" concurrency "_"
diff --git a/stdlib/source/test/lux/control/concatenative.lux b/stdlib/source/test/lux/control/concatenative.lux
index 1edbeccf4..fc2bfcd3e 100644
--- a/stdlib/source/test/lux/control/concatenative.lux
+++ b/stdlib/source/test/lux/control/concatenative.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [data
     ["[0]" sum]
     ["[0]" bit ("[1]#[0]" equivalence)]]
@@ -17,7 +17,7 @@
      ["r" rev]
      ["f" frac]]]]]
  [\\library
-  ["[0]" / {"+" word: => ||>}]])
+  ["[0]" / (.only word: => ||>)]])
 
 (def: stack_shuffling
   Test
diff --git a/stdlib/source/test/lux/control/concurrency/actor.lux b/stdlib/source/test/lux/control/concurrency/actor.lux
index fd99d624d..535e66bb4 100644
--- a/stdlib/source/test/lux/control/concurrency/actor.lux
+++ b/stdlib/source/test/lux/control/concurrency/actor.lux
@@ -1,28 +1,28 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
-    ["[0]" try {"+" Try}]
-    ["[0]" exception {"+" exception:}]
-    ["[0]" io {"+" IO io}]]
+    ["[0]" try (.only Try)]
+    ["[0]" exception (.only exception:)]
+    ["[0]" io (.only IO io)]]
    [data
     [text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]
-     ["[0]" sequence {"+" Sequence}]]]
+     ["[0]" sequence (.only Sequence)]]]
    [math
     ["[0]" random]
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" actor: message:}
+  ["[0]" / (.only actor: message:)
    [//
-    ["[0]" atom {"+" Atom}]
-    ["[0]" async {"+" Async Resolver} ("[1]#[0]" monad)]
+    ["[0]" atom (.only Atom)]
+    ["[0]" async (.only Async Resolver) ("[1]#[0]" monad)]
     ["[0]" frp]]]])
 
 (exception: got_wrecked)
diff --git a/stdlib/source/test/lux/control/concurrency/async.lux b/stdlib/source/test/lux/control/concurrency/async.lux
index 0e59faf3d..39d2c8a28 100644
--- a/stdlib/source/test/lux/control/concurrency/async.lux
+++ b/stdlib/source/test/lux/control/concurrency/async.lux
@@ -1,12 +1,12 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    ["@" target]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [control
@@ -23,7 +23,7 @@
  [\\library
   ["[0]" /
    [//
-    ["[0]" atom {"+" Atom}]]]])
+    ["[0]" atom (.only Atom)]]]])
 
 (def: injection
   (Injection /.Async)
diff --git a/stdlib/source/test/lux/control/concurrency/atom.lux b/stdlib/source/test/lux/control/concurrency/atom.lux
index 04b80f7ca..48614cdac 100644
--- a/stdlib/source/test/lux/control/concurrency/atom.lux
+++ b/stdlib/source/test/lux/control/concurrency/atom.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" io]]
    [math
diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux
index c5c84f492..9c552c888 100644
--- a/stdlib/source/test/lux/control/concurrency/frp.lux
+++ b/stdlib/source/test/lux/control/concurrency/frp.lux
@@ -1,21 +1,21 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [control
     ["[0]" try]
     ["[0]" exception]
-    ["[0]" io {"+" IO io}]]
+    ["[0]" io (.only IO io)]]
    [data
     [collection
      ["[0]" list ("[1]#[0]" mix monoid)]
-     ["[0]" sequence {"+" Sequence}]]]
+     ["[0]" sequence (.only Sequence)]]]
    [math
     ["[0]" random]
     [number
@@ -25,8 +25,8 @@
  [\\library
   ["[0]" /
    [//
-    ["[0]" async {"+" Async} ("[1]#[0]" monad)]
-    ["[0]" atom {"+" Atom atom}]]]])
+    ["[0]" async (.only Async) ("[1]#[0]" monad)]
+    ["[0]" atom (.only Atom atom)]]]])
 
 (def: injection
   (Injection /.Channel)
diff --git a/stdlib/source/test/lux/control/concurrency/semaphore.lux b/stdlib/source/test/lux/control/concurrency/semaphore.lux
index 275613ebd..710084670 100644
--- a/stdlib/source/test/lux/control/concurrency/semaphore.lux
+++ b/stdlib/source/test/lux/control/concurrency/semaphore.lux
@@ -1,22 +1,22 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    ["@" target]
    [abstract
-    ["[0]" monad {"+" do}]
+    ["[0]" monad (.only do)]
     ["[0]" enum]]
    [control
     ["[0]" io]
     ["[0]" maybe]
     ["[0]" try]
-    ["[0]" exception {"+" exception:}]
+    ["[0]" exception (.only exception:)]
     [concurrency
-     ["[0]" async {"+" Async}]
-     ["[0]" atom {"+" Atom}]]]
+     ["[0]" async (.only Async)]
+     ["[0]" atom (.only Atom)]]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]
    [math
diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux
index 6b0e64a57..9826808f3 100644
--- a/stdlib/source/test/lux/control/concurrency/stm.lux
+++ b/stdlib/source/test/lux/control/concurrency/stm.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    ["[0]" monad {"+" Monad do}]
+    ["[0]" monad (.only Monad do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [control
-    ["[0]" io {"+" IO}]]
+    ["[0]" io (.only IO)]]
    [data
     ["[0]" product]
     [collection
@@ -21,9 +21,9 @@
  [\\library
   ["[0]" /
    [//
-    ["[0]" atom {"+" Atom atom}]
+    ["[0]" atom (.only Atom atom)]
     ["[0]" async]
-    ["[0]" frp {"+" Channel}]]]])
+    ["[0]" frp (.only Channel)]]]])
 
 (def: injection
   (Injection /.STM)
diff --git a/stdlib/source/test/lux/control/concurrency/thread.lux b/stdlib/source/test/lux/control/concurrency/thread.lux
index cebb90dd8..ef41bdc14 100644
--- a/stdlib/source/test/lux/control/concurrency/thread.lux
+++ b/stdlib/source/test/lux/control/concurrency/thread.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" io]]
    [time
-    ["[0]" instant {"+" Instant}]
+    ["[0]" instant (.only Instant)]
     ["[0]" duration]]
    [math
     ["[0]" random]
@@ -17,7 +17,7 @@
  [\\library
   ["[0]" /
    [//
-    ["[0]" atom {"+" Atom}]
+    ["[0]" atom (.only Atom)]
     ["[0]" async]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/control/continuation.lux b/stdlib/source/test/lux/control/continuation.lux
index 062142453..8da80291a 100644
--- a/stdlib/source/test/lux/control/continuation.lux
+++ b/stdlib/source/test/lux/control/continuation.lux
@@ -1,11 +1,11 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [data
diff --git a/stdlib/source/test/lux/control/exception.lux b/stdlib/source/test/lux/control/exception.lux
index fb69ebee8..225915128 100644
--- a/stdlib/source/test/lux/control/exception.lux
+++ b/stdlib/source/test/lux/control/exception.lux
@@ -1,20 +1,20 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [math
     ["[0]" random]
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" exception:}
+  ["[0]" / (.only exception:)
    [//
-    ["[0]" try {"+" Try}]]]])
+    ["[0]" try (.only Try)]]]])
 
 (exception: an_exception)
 (exception: another_exception)
diff --git a/stdlib/source/test/lux/control/function.lux b/stdlib/source/test/lux/control/function.lux
index e6a9eb5b4..510fae5f4 100644
--- a/stdlib/source/test/lux/control/function.lux
+++ b/stdlib/source/test/lux/control/function.lux
@@ -1,14 +1,14 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [equivalence {"+" Equivalence}]
-    [monad {"+" do}]
+    [equivalence (.only Equivalence)]
+    [monad (.only do)]
     [\\specification
      ["$[0]" monoid]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
  [\\library
diff --git a/stdlib/source/test/lux/control/function/contract.lux b/stdlib/source/test/lux/control/function/contract.lux
index cf12b1fbf..e6ad2ce29 100644
--- a/stdlib/source/test/lux/control/function/contract.lux
+++ b/stdlib/source/test/lux/control/function/contract.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try]
     ["[0]" exception]]
diff --git a/stdlib/source/test/lux/control/function/inline.lux b/stdlib/source/test/lux/control/function/inline.lux
index 98bc73c3b..a992b6cb4 100644
--- a/stdlib/source/test/lux/control/function/inline.lux
+++ b/stdlib/source/test/lux/control/function/inline.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [math
     ["[0]" random]
     [number
diff --git a/stdlib/source/test/lux/control/function/memo.lux b/stdlib/source/test/lux/control/function/memo.lux
index 84abe3905..c01040b34 100644
--- a/stdlib/source/test/lux/control/function/memo.lux
+++ b/stdlib/source/test/lux/control/function/memo.lux
@@ -1,16 +1,16 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
-    ["[0]" io {"+" IO}]
-    ["[0]" state {"+" State} ("[1]#[0]" monad)]]
+    ["[0]" io (.only IO)]
+    ["[0]" state (.only State) ("[1]#[0]" monad)]]
    [data
     ["[0]" product]
     [collection
-     ["[0]" dictionary {"+" Dictionary}]
+     ["[0]" dictionary (.only Dictionary)]
      ["[0]" list ("[1]#[0]" functor mix)]]]
    [macro
     ["^" pattern]]
@@ -21,7 +21,7 @@
      ["[0]" i64]]]
    [time
     ["[0]" instant]
-    ["[0]" duration {"+" Duration}]]]]
+    ["[0]" duration (.only Duration)]]]]
  [\\library
   ["[0]" /
    ["/[1]" // "_"
diff --git a/stdlib/source/test/lux/control/function/mixin.lux b/stdlib/source/test/lux/control/function/mixin.lux
index 8cb2ae3c6..6cabe7a62 100644
--- a/stdlib/source/test/lux/control/function/mixin.lux
+++ b/stdlib/source/test/lux/control/function/mixin.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [equivalence {"+" Equivalence}]
-    [predicate {"+" Predicate}]
-    [monad {"+" do}]
+    [equivalence (.only Equivalence)]
+    [predicate (.only Predicate)]
+    [monad (.only do)]
     [\\specification
      ["$[0]" monoid]]]
    [control
-    ["[0]" state {"+" State}]]
+    ["[0]" state (.only State)]]
    [data
     ["[0]" product]
     [collection
@@ -17,7 +17,7 @@
    [macro
     ["^" pattern]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
  [\\library
diff --git a/stdlib/source/test/lux/control/function/mutual.lux b/stdlib/source/test/lux/control/function/mutual.lux
index 1b5c38f78..badf850a0 100644
--- a/stdlib/source/test/lux/control/function/mutual.lux
+++ b/stdlib/source/test/lux/control/function/mutual.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [data
     ["[0]" bit ("[1]#[0]" equivalence)]
     [text
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
  [\\library
diff --git a/stdlib/source/test/lux/control/io.lux b/stdlib/source/test/lux/control/io.lux
index 52cdf2b8c..df063a508 100644
--- a/stdlib/source/test/lux/control/io.lux
+++ b/stdlib/source/test/lux/control/io.lux
@@ -1,11 +1,11 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [math
@@ -13,7 +13,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" IO}
+  ["[0]" / (.only IO)
    [//
     ["[0]" function]]]])
 
diff --git a/stdlib/source/test/lux/control/lazy.lux b/stdlib/source/test/lux/control/lazy.lux
index 0c00be310..cc79c4b46 100644
--- a/stdlib/source/test/lux/control/lazy.lux
+++ b/stdlib/source/test/lux/control/lazy.lux
@@ -1,22 +1,22 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]
      ["$[0]" equivalence]]]
    [data
     ["[0]" product]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" Lazy}]])
+  ["[0]" / (.only Lazy)]])
 
 (def: injection
   (Injection Lazy)
diff --git a/stdlib/source/test/lux/control/maybe.lux b/stdlib/source/test/lux/control/maybe.lux
index e980121b7..b12b76f92 100644
--- a/stdlib/source/test/lux/control/maybe.lux
+++ b/stdlib/source/test/lux/control/maybe.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" hash]
@@ -19,7 +19,7 @@
     [collection
      ["[0]" list]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
  [\\library
diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux
index fcb84271d..567a825b8 100644
--- a/stdlib/source/test/lux/control/parser.lux
+++ b/stdlib/source/test/lux/control/parser.lux
@@ -1,21 +1,21 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
-    [equivalence {"+" Equivalence}]
+    [monad (.only do)]
+    [equivalence (.only Equivalence)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [control
-    ["[0]" try {"+" Try}]
+    ["[0]" try (.only Try)]
     [parser
      ["<[0]>" code]]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]
    [math
@@ -23,10 +23,10 @@
     [number
      ["n" nat]]]
    [macro
-    [syntax {"+" syntax:}]
+    [syntax (.only syntax:)]
     ["[0]" code]]]]
  [\\library
-  ["[0]" / {"+" Parser}]]
+  ["[0]" / (.only Parser)]]
  ["[0]" / "_"
   ["[1][0]" analysis]
   ["[1][0]" binary]
diff --git a/stdlib/source/test/lux/control/parser/analysis.lux b/stdlib/source/test/lux/control/parser/analysis.lux
index 92be5bc35..453138aaa 100644
--- a/stdlib/source/test/lux/control/parser/analysis.lux
+++ b/stdlib/source/test/lux/control/parser/analysis.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" pipe]
     ["[0]" try]
@@ -15,7 +15,7 @@
     [collection
      ["[0]" list]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]
      ["i" int]
@@ -25,8 +25,8 @@
     ["[0]" symbol ("[1]#[0]" equivalence)]]
    [tool
     [compiler
-     [reference {"+" Constant}
-      [variable {"+"}]]
+     [reference (.only Constant)
+      [variable (.only)]]
      [language
       [lux
        ["[0]" analysis]]]]]]]
diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux
index 50f1bea42..9ede7e084 100644
--- a/stdlib/source/test/lux/control/parser/binary.lux
+++ b/stdlib/source/test/lux/control/parser/binary.lux
@@ -1,12 +1,12 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    ["[0]" type]
    [abstract
-    [equivalence {"+" Equivalence}]
-    [predicate {"+" Predicate}]
-    [monad {"+" do}]]
+    [equivalence (.only Equivalence)]
+    [predicate (.only Predicate)]
+    [monad (.only do)]]
    [control
     ["[0]" pipe]
     ["[0]" maybe]
@@ -18,7 +18,7 @@
     ["[0]" sum]
     ["[0]" bit]
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]
+     ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
     ["[0]" format "_"
@@ -31,7 +31,7 @@
     ["^" pattern]
     ["[0]" code]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]
      ["[0]" i64]
diff --git a/stdlib/source/test/lux/control/parser/cli.lux b/stdlib/source/test/lux/control/parser/cli.lux
index 69d9a20e7..5cfb0e2a2 100644
--- a/stdlib/source/test/lux/control/parser/cli.lux
+++ b/stdlib/source/test/lux/control/parser/cli.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try]
     ["<>" parser]]
diff --git a/stdlib/source/test/lux/control/parser/code.lux b/stdlib/source/test/lux/control/parser/code.lux
index c4e202aba..10202231e 100644
--- a/stdlib/source/test/lux/control/parser/code.lux
+++ b/stdlib/source/test/lux/control/parser/code.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux {"-" local global}
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" function]
     ["[0]" try]
@@ -17,7 +17,7 @@
     ["^" pattern]
     ["[0]" code]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" functor)]
+    ["[0]" random (.only Random) ("[1]#[0]" functor)]
     [number
      ["[0]" nat]
      ["[0]" int]
diff --git a/stdlib/source/test/lux/control/parser/environment.lux b/stdlib/source/test/lux/control/parser/environment.lux
index 3f1c4bd6d..5cf714641 100644
--- a/stdlib/source/test/lux/control/parser/environment.lux
+++ b/stdlib/source/test/lux/control/parser/environment.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try]
     ["[0]" exception]]
diff --git a/stdlib/source/test/lux/control/parser/json.lux b/stdlib/source/test/lux/control/parser/json.lux
index 40d48afab..775e03093 100644
--- a/stdlib/source/test/lux/control/parser/json.lux
+++ b/stdlib/source/test/lux/control/parser/json.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" pipe]
     ["[0]" maybe]
@@ -17,13 +17,13 @@
      ["[0]" list ("[1]#[0]" functor)]
      ["[0]" set]
      ["[0]" dictionary]
-     ["[0]" sequence {"+" sequence} ("[1]#[0]" functor)]]
+     ["[0]" sequence (.only sequence) ("[1]#[0]" functor)]]
     [format
      ["[0]" json]]]
    [macro
     ["^" pattern]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]
      ["[0]" frac]]]]]
diff --git a/stdlib/source/test/lux/control/parser/synthesis.lux b/stdlib/source/test/lux/control/parser/synthesis.lux
index 4cf859a46..901821c1f 100644
--- a/stdlib/source/test/lux/control/parser/synthesis.lux
+++ b/stdlib/source/test/lux/control/parser/synthesis.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    ["[0]" monad {"+" do}]]
+    ["[0]" monad (.only do)]]
    [control
     ["<>" parser]
     ["[0]" try]
@@ -16,7 +16,7 @@
    [macro
     ["^" pattern]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]
      ["[0]" i64]
@@ -25,12 +25,12 @@
     ["[0]" symbol]]
    [tool
     [compiler
-     [reference {"+" }
-      ["[0]" variable {"+" Variable}]]
+     [reference (.only)
+      ["[0]" variable (.only Variable)]]
      [language
       [lux
-       [analysis {"+" Environment}]
-       ["[0]" synthesis {"+" Synthesis}]]]]]]]
+       [analysis (.only Environment)]
+       ["[0]" synthesis (.only Synthesis)]]]]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux
index 94f067ef7..b1ba8f9f7 100644
--- a/stdlib/source/test/lux/control/parser/text.lux
+++ b/stdlib/source/test/lux/control/parser/text.lux
@@ -1,17 +1,17 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" maybe]
-    ["[0]" try {"+" Try}]
-    ["[0]" exception {"+" Exception}]
+    ["[0]" try (.only Try)]
+    ["[0]" exception (.only Exception)]
     ["[0]" function]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]
+     ["%" format (.only format)]
      ["[0]" unicode "_"
       ["[1]" set]
       ["[1]/[0]" block]]]
@@ -22,7 +22,7 @@
       ["[0]" finger]]]]
    [math
     ["[0]" random]
-    [number {"+" hex}
+    [number (.only hex)
      ["n" nat]]]
    [macro
     ["^" pattern]
diff --git a/stdlib/source/test/lux/control/parser/tree.lux b/stdlib/source/test/lux/control/parser/tree.lux
index 391e90014..5ba170c13 100644
--- a/stdlib/source/test/lux/control/parser/tree.lux
+++ b/stdlib/source/test/lux/control/parser/tree.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try]
     ["[0]" exception]]
diff --git a/stdlib/source/test/lux/control/parser/type.lux b/stdlib/source/test/lux/control/parser/type.lux
index 66f5114db..da05ecdc9 100644
--- a/stdlib/source/test/lux/control/parser/type.lux
+++ b/stdlib/source/test/lux/control/parser/type.lux
@@ -1,22 +1,22 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    ["[0]" type ("[1]#[0]" equivalence)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try]
     ["[0]" exception]]
    [data
     [text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list]]]
    [macro
     ["^" pattern]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    [meta
diff --git a/stdlib/source/test/lux/control/parser/xml.lux b/stdlib/source/test/lux/control/parser/xml.lux
index f3e19d428..b2bc6a83b 100644
--- a/stdlib/source/test/lux/control/parser/xml.lux
+++ b/stdlib/source/test/lux/control/parser/xml.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    ["[0]" type ("[1]#[0]" equivalence)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try ("[1]#[0]" functor)]
     ["[0]" exception]]
@@ -19,7 +19,7 @@
     ["^" pattern]
     ["[0]" template]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    [meta
diff --git a/stdlib/source/test/lux/control/pipe.lux b/stdlib/source/test/lux/control/pipe.lux
index 3c1c53232..8644e36d7 100644
--- a/stdlib/source/test/lux/control/pipe.lux
+++ b/stdlib/source/test/lux/control/pipe.lux
@@ -1,14 +1,14 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    ["[0]" debug]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [data
     ["[0]" identity]
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [math
     ["[0]" random]
     [number
diff --git a/stdlib/source/test/lux/control/reader.lux b/stdlib/source/test/lux/control/reader.lux
index fead04bfa..9471e2f93 100644
--- a/stdlib/source/test/lux/control/reader.lux
+++ b/stdlib/source/test/lux/control/reader.lux
@@ -1,11 +1,11 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [math
@@ -13,9 +13,9 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" Reader}
+  ["[0]" / (.only Reader)
    [//
-    ["[0]" io {"+" IO}]]]])
+    ["[0]" io (.only IO)]]]])
 
 (def: (injection value)
   (Injection (All (_ a r) (Reader r a)))
diff --git a/stdlib/source/test/lux/control/region.lux b/stdlib/source/test/lux/control/region.lux
index da40cde51..4a257cce6 100644
--- a/stdlib/source/test/lux/control/region.lux
+++ b/stdlib/source/test/lux/control/region.lux
@@ -1,20 +1,20 @@
 (.using
  [library
   [lux "*"
-   [type {"+" sharing}]
-   ["_" test {"+" Test}]
+   [type (.only sharing)]
+   ["_" test (.only Test)]
    [abstract
-    [equivalence {"+" Equivalence}]
-    [functor {"+" Functor}]
-    [apply {"+" Apply}]
-    ["[0]" monad {"+" Monad do}]
+    [equivalence (.only Equivalence)]
+    [functor (.only Functor)]
+    [apply (.only Apply)]
+    ["[0]" monad (.only Monad do)]
     ["[0]" enum]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [control
-    ["[0]" try {"+" Try}]]
+    ["[0]" try (.only Try)]]
    [data
     [collection
      ["[0]" list]]]
@@ -23,10 +23,10 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" Region}
+  ["[0]" / (.only Region)
    [//
-    ["[0]" thread {"+" Thread}]
-    ["[0]" exception {"+" Exception exception:}]]]])
+    ["[0]" thread (.only Thread)]
+    ["[0]" exception (.only Exception exception:)]]]])
 
 (exception: oops)
 
diff --git a/stdlib/source/test/lux/control/remember.lux b/stdlib/source/test/lux/control/remember.lux
index 575e99aac..0fcd8833c 100644
--- a/stdlib/source/test/lux/control/remember.lux
+++ b/stdlib/source/test/lux/control/remember.lux
@@ -1,30 +1,30 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    ["[0]" meta]
    [abstract
-    ["[0]" monad {"+" do}]]
+    ["[0]" monad (.only do)]]
    [control
     ["[0]" io]
-    ["[0]" try {"+" Try}]
+    ["[0]" try (.only Try)]
     ["[0]" exception]
     [parser
      ["<[0]>" code]]]
    [data
     ["[0]" product]
     ["[0]" text
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [math
-    [number {"+" hex}]
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]]
+    [number (.only hex)]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]]
    [time
-    ["[0]" date {"+" Date}]
+    ["[0]" date (.only Date)]
     ["[0]" instant]
     ["[0]" duration]]
    ["[0]" macro
     ["[0]" code]
-    ["[0]" syntax {"+" syntax:}]]]]
+    ["[0]" syntax (.only syntax:)]]]]
  [\\library
   ["[0]" /]])
 
diff --git a/stdlib/source/test/lux/control/security/capability.lux b/stdlib/source/test/lux/control/security/capability.lux
index aa25ebd6c..c68e5454c 100644
--- a/stdlib/source/test/lux/control/security/capability.lux
+++ b/stdlib/source/test/lux/control/security/capability.lux
@@ -1,11 +1,11 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
-    ["[0]" io {"+" IO}]
+    ["[0]" io (.only IO)]
     [concurrency
      ["[0]" async]]]
    [math
diff --git a/stdlib/source/test/lux/control/security/policy.lux b/stdlib/source/test/lux/control/security/policy.lux
index afa9b2bda..60279a089 100644
--- a/stdlib/source/test/lux/control/security/policy.lux
+++ b/stdlib/source/test/lux/control/security/policy.lux
@@ -1,12 +1,12 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [hash {"+" Hash}]
-    [monad {"+" do}]
+    [hash (.only Hash)]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [data
@@ -18,7 +18,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" Context Privacy Can_Conceal Can_Reveal Privilege Private}]])
+  ["[0]" / (.only Context Privacy Can_Conceal Can_Reveal Privilege Private)]])
 
 (def: (injection can_conceal)
   (All (_ label)
diff --git a/stdlib/source/test/lux/control/state.lux b/stdlib/source/test/lux/control/state.lux
index d821f5e62..2014d74fe 100644
--- a/stdlib/source/test/lux/control/state.lux
+++ b/stdlib/source/test/lux/control/state.lux
@@ -1,11 +1,11 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [control
@@ -18,7 +18,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" State}]])
+  ["[0]" / (.only State)]])
 
 (def: (with_conditions [state output] computation)
   (-> [Nat Nat] (State Nat Nat) Bit)
diff --git a/stdlib/source/test/lux/control/thread.lux b/stdlib/source/test/lux/control/thread.lux
index ed83c132f..808936de6 100644
--- a/stdlib/source/test/lux/control/thread.lux
+++ b/stdlib/source/test/lux/control/thread.lux
@@ -1,11 +1,11 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [math
@@ -13,7 +13,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" Thread}
+  ["[0]" / (.only Thread)
    [//
     ["[0]" io]]]])
 
diff --git a/stdlib/source/test/lux/control/try.lux b/stdlib/source/test/lux/control/try.lux
index 1c9af6336..7229b588d 100644
--- a/stdlib/source/test/lux/control/try.lux
+++ b/stdlib/source/test/lux/control/try.lux
@@ -1,11 +1,11 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]
      ["$[0]" equivalence]]]
@@ -15,11 +15,11 @@
    [data
     ["[0]" text ("[1]#[0]" equivalence)]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" Try}]])
+  ["[0]" / (.only Try)]])
 
 (def: injection
   (Injection Try)
diff --git a/stdlib/source/test/lux/control/writer.lux b/stdlib/source/test/lux/control/writer.lux
index 418024334..6dd67b4c4 100644
--- a/stdlib/source/test/lux/control/writer.lux
+++ b/stdlib/source/test/lux/control/writer.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [equivalence {"+" Equivalence}]
-    [monoid {"+" Monoid}]
-    [monad {"+" do}]
+    [equivalence (.only Equivalence)]
+    [monoid (.only Monoid)]
+    [monad (.only do)]
     [\\specification
-     ["$[0]" functor {"+" Injection Comparison}]
+     ["$[0]" functor (.only Injection Comparison)]
      ["$[0]" apply]
      ["$[0]" monad]]]
    [control
@@ -20,7 +20,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" / {"+" Writer}]])
+  ["[0]" / (.only Writer)]])
 
 (def: (injection monoid value)
   (All (_ w) (-> (Monoid w) (Injection (Writer w))))