Extensible import syntax [Part 4]

175 files changed, 432 insertions, 439 deletions

diff --git a/stdlib/source/test/aedifex.lux b/stdlib/source/test/aedifex.lux
index 0e35d1714..39a98a424 100644
--- a/stdlib/source/test/aedifex.lux
+++ b/stdlib/source/test/aedifex.lux
@@ -5,7 +5,7 @@
    ["_" test (.only Test)]
    [control
     ["[0]" io]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" artifact]
   ["[1][0]" cli]
   ["[1][0]" command]
diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux
index 1dcc00f38..3c6992628 100644
--- a/stdlib/source/test/aedifex/artifact.lux
+++ b/stdlib/source/test/aedifex/artifact.lux
@@ -17,7 +17,7 @@
     ["[0]" file]
     [net
      ["[0]" uri]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" extension]
   ["[1][0]" snapshot]
   ["[1][0]" time]
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index 5ec2f0939..4314050e8 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -14,8 +14,8 @@
     [number
      ["n" nat]]]]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" type]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index adfb1efc8..592b731ce 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -12,7 +12,7 @@
      ["<[0]>" xml]]]
    [math
     ["[0]" random (.only Random) ("[1]#[0]" monad)]]]]
- ["$[0]" / "_"
+ ["$[0]" /
   ["[1][0]" build]
   ["[1][0]" stamp]
   ["[1][0]" time]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index 92034c73f..eb9b88684 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -16,7 +16,7 @@
     ["[0]" instant]]]]
  [\\program
   ["[0]" /]]
- ["$[0]" // "_"
+ ["$[0]" //
   ["[1][0]" time]
   ["[1][0]" build]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index e56495624..7b078ff05 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -14,7 +14,7 @@
     ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" time]])
 
 (def: .public random
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 59860fec4..e35b1e58c 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -14,9 +14,9 @@
     ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" value]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" type]
   ["[1][0]" time]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index e157ff361..9a68089bb 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -20,11 +20,11 @@
      ["i" int]]]
    [time
     ["[0]" instant]]]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" stamp]]
  [\\program
-  ["[0]" /
-   ["//[1]" ///
+  ["[0]" / (.only)
+   ["//[1]" /// (.only)
     ["[1][0]" stamp]
     ["[1][0]" time]]]])
 
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index a74865f0c..0eec2b191 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -18,7 +18,7 @@
      ["i" int]]]]]
  [\\program
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" date]
   ["[1][0]" time]])
 
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index 2f345da94..1c3d4ca55 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -14,9 +14,9 @@
     ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]]
- ["$[0]" // "_"
+ ["$[0]" //
   ["[1][0]" time]
-  ["[1][0]" snapshot
+  ["[1][0]" snapshot (.only)
    ["[1]/[0]" version]]])
 
 (def: .public random
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index ab035f0e8..13b8e27d4 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -33,8 +33,8 @@
     [data
      ["_[0]" binary]]]]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" profile (.only Profile)]
     ["[1][0]" package (.only Package)]
     ["[1][0]" pom]
@@ -42,7 +42,7 @@
      ["[1]/[0]" resolution (.only Resolution)]]
     ["[1][0]" artifact (.only Artifact)
      ["[1]/[0]" type (.only Type)]]
-    ["[1][0]" repository "_"
+    ["[1][0]" repository
      ["[1]/[0]" origin]]]]])
 
 (def: type
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux
index 45e1f7b23..804d0d527 100644
--- a/stdlib/source/test/aedifex/cli.lux
+++ b/stdlib/source/test/aedifex/cli.lux
@@ -18,8 +18,8 @@
    [math
     ["[0]" random (.only Random) ("[1]#[0]" monad)]]]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" profile]]]])
 
 (def: compilation
diff --git a/stdlib/source/test/aedifex/command.lux b/stdlib/source/test/aedifex/command.lux
index 728bff970..5005403cf 100644
--- a/stdlib/source/test/aedifex/command.lux
+++ b/stdlib/source/test/aedifex/command.lux
@@ -2,7 +2,7 @@
  [library
   [lux (.full)
    ["_" test (.only Test)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" version]
   ["[1][0]" pom]
 
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index eac71601d..fd7543d16 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -14,7 +14,7 @@
      ["[0]" async (.only Async)]]]
    [data
     ["[0]" binary]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
@@ -32,12 +32,12 @@
     ["[0]" program (.only Program)]
     ["[0]" file
      ["[0]" watch]]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["$[0]" version]
   ["$[0]" build]]
  [\\program
-  ["[0]" /
-   ["//[1]" /// "_"
+  ["[0]" / (.only)
+   ["//[1]" ///
     [command (.only Command)]
     ["[1]" profile (.only Profile)]
     ["[1][0]" action]
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index 68d9aedc3..f6c220743 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -23,16 +23,16 @@
     ["[0]" file]
     ["[0]" shell (.only Shell)]
     ["[0]" program]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["@[0]" version]
-  ["$/[1]" // "_"
+  ["$/[1]" //
    ["[1][0]" package]]]
  [\\program
-  ["[0]" /
-   ["//[1]" /// "_"
+  ["[0]" / (.only)
+   ["//[1]" ///
     ["[1]" profile (.only Profile)]
     ["[1][0]" action]
-    ["[1][0]" artifact
+    ["[1][0]" artifact (.only)
      ["[1]/[0]" type]]
     ["[1][0]" dependency (.only Dependency)
      ["[1]/[0]" resolution (.only Resolution)]]]]])
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index e6b9019b2..c0264da9f 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -31,8 +31,8 @@
      [data
       ["$[0]" binary]]]]]]
  [\\program
-  ["[0]" /
-   ["//[1]" /// "_"
+  ["[0]" / (.only)
+   ["//[1]" ///
     ["[1]" profile]
     ["[1][0]" action (.only Action)]]]])
 
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index de4c79b7f..1c925ec2f 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -17,7 +17,7 @@
      ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary]
      ["[0]" tar]
      ["[0]" xml]]
@@ -41,8 +41,8 @@
    ["$[0]" profile]
    ["$[0]" repository]]]
  [\\program
-  ["[0]" /
-   ["//[1]" /// "_"
+  ["[0]" / (.only)
+   ["//[1]" ///
     ["[1]" profile]
     ["[1][0]" action]
     ["[1][0]" pom]
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index c423f822e..975757374 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -26,29 +26,29 @@
    [world
     ["[0]" program]
     ["[0]" file]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["@[0]" version]
-  ["$/[1]" // "_"
+  ["$/[1]" //
    ["[1][0]" package]
    ["[1][0]" artifact]
-   ["[1][0]" dependency "_"
+   ["[1][0]" dependency
     ["[1]/[0]" resolution]]]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1][0]" clean]
-    ["/[1]" // "_"
+    ["/[1]" //
      ["[1]" profile]
      ["[1][0]" action]
      ["[1][0]" pom]
      ["[1][0]" package]
-     ["[1][0]" artifact
+     ["[1][0]" artifact (.only)
       ["[1]/[0]" type]]
-     ["[1][0]" dependency
+     ["[1][0]" dependency (.only)
       ["[1]/[0]" resolution]
       ["[1]/[0]" deployment]
       ["[1]/[0]" status]]
-     ["[1][0]" repository
+     ["[1][0]" repository (.only)
       ["[1]/[0]" origin]
       ["[1]/[0]" local]]]]]])
 
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index 3bbc052eb..0d03d982c 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -28,16 +28,15 @@
    ["$[0]" profile]
    ["$[0]" artifact]]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
-    ["/[1]" // "_"
-     ["[1]" profile]
-     ["[1][0]" action (.only Action)]
-     ["[1][0]" local]
-     ["[1][0]" artifact
-      ["[1]/[0]" extension]]
-     ["[1][0]" repository "_"
-      ["[1]/[0]" local]]]]]])
+  ["[0]" / (.only)
+   ["/[1]" ///
+    ["[1]" profile]
+    ["[1][0]" action (.only Action)]
+    ["[1][0]" local]
+    ["[1][0]" artifact (.only)
+     ["[1]/[0]" extension]]
+    ["[1][0]" repository
+     ["[1]/[0]" local]]]]])
 
 (def: .public (make_sources! fs sources)
   (-> (file.System Async) (Set file.Path) (Action (List Any)))
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index b0453fb9e..69eb2fc8c 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -24,8 +24,8 @@
   [//
    ["@[0]" profile]]]
  [\\program
-  ["[0]" /
-   ["//[1]" /// "_"
+  ["[0]" / (.only)
+   ["//[1]" ///
     ["[1]" profile]
     ["[1][0]" action]
     ["[1][0]" pom]]]])
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index 93a55d03f..f8cd1d45c 100644
--- a/stdlib/source/test/aedifex/command/test.lux
+++ b/stdlib/source/test/aedifex/command/test.lux
@@ -22,21 +22,21 @@
     ["[0]" file]
     ["[0]" shell]
     ["[0]" program]]]]
- ["[0]" // "_"
+ ["[0]" //
   ["@[0]" version]
   ["@[0]" build]
-  ["$/[1]" // "_"
+  ["$/[1]" //
    ["[1][0]" package]]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1][0]" build]
-    ["/[1]" // "_"
+    ["/[1]" //
      ["[1]" profile (.only Profile)]
      ["[1][0]" action]
      ["[1][0]" artifact
       ["[1]/[0]" type]]
-     ["[1][0]" dependency
+     ["[1][0]" dependency (.only)
       ["[1]/[0]" resolution]]]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index f535c2383..ec8bf79f7 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -15,7 +15,7 @@
    [data
     ["[0]" product]
     ["[0]" binary (.only Binary) ("[1]#[0]" equivalence)]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" dictionary (.only Dictionary)]
@@ -28,15 +28,15 @@
    [world
     [net (.only URL)
      ["[0]" uri (.only URI)]
-     ["[0]" http "_"
+     ["[0]" http
       ["[1]" client]
       ["[1]/[0]" status]
       ["@[1]" /]]]]]]
- ["$[0]" //
-  ["[1]/" // "_"
+ ["$[0]" // (.only)
+  ["[1]/" //
    ["[1][0]" package]]]
  [\\program
-  ["[0]" /
+  ["[0]" / (.only)
    [// (.only Dependency)
     ["[0]" resolution]
     [//
@@ -46,7 +46,7 @@
      ["[0]" artifact (.only Artifact) ("[1]#[0]" equivalence)
       ["[1]/[0]" type]
       ["[1]/[0]" extension]]
-     ["[0]" repository
+     ["[0]" repository (.only)
       ["[0]" remote]]]]]])
 
 (def: good_upload
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index e5bd1af47..666bd0c53 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -15,7 +15,7 @@
    [data
     [binary (.only Binary)]
     ["[0]" product]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
@@ -27,15 +27,15 @@
      ["[0]" list]]]
    [math
     ["[0]" random (.only Random)]]]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" package]
   ["[1][0]" repository]
   ["[1][0]" artifact]
   [command
    ["[1][0]" version]]]
  [\\program
-  ["[0]" /
-   ["//[1]" /// "_"
+  ["[0]" / (.only)
+   ["//[1]" ///
     ["[1]" profile]
     ["[1][0]" package (.only Package)]
     ["[1][0]" hash]
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index ca0f9002d..9b5f089f1 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -7,15 +7,15 @@
     [\\specification
      ["$[0]" equivalence]]]
    [data
-    ["[0]" binary "_"
+    ["[0]" binary
      ["[1]T" \\test]]]
    [math
     ["[0]" random (.only Random) ("[1]#[0]" monad)]]]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" hash]]
  [\\program
-  ["[0]" /
-   ["//[1]" /// "_"
+  ["[0]" / (.only)
+   ["//[1]" ///
     ["[1][0]" hash]]]])
 
 (def: .public random
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index d917b5903..0c5b09a06 100644
--- a/stdlib/source/test/aedifex/input.lux
+++ b/stdlib/source/test/aedifex/input.lux
@@ -22,8 +22,8 @@
  [//
   ["$[0]" profile]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" profile (.only Profile)]
     ["[1][0]" project]
     ["[1][0]" action]
diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux
index bc8016743..dfb17ebad 100644
--- a/stdlib/source/test/aedifex/local.lux
+++ b/stdlib/source/test/aedifex/local.lux
@@ -11,8 +11,8 @@
  [//
   ["@[0]" artifact]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1][0]" artifact]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/aedifex/metadata.lux b/stdlib/source/test/aedifex/metadata.lux
index bcdfee998..7bdf5b983 100644
--- a/stdlib/source/test/aedifex/metadata.lux
+++ b/stdlib/source/test/aedifex/metadata.lux
@@ -8,7 +8,7 @@
     ["[0]" text ("[1]#[0]" equivalence)]]
    [math
     ["[0]" random]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" artifact]
   ["[1][0]" snapshot]
   [//
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index e78d7b977..dc1189ffd 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -24,7 +24,7 @@
     ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
-   ["[0]" time
+   ["[0]" time (.only)
     ["[0]" date]
     ["[0]" year]
     ["[0]" month]
@@ -34,11 +34,11 @@
     ["[0]" file]
     ["[0]" program]]]]
  [\\program
-  ["[0]" /
-   ["/[1]" //
-    ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
+    ["/[1]" //
      ["[1][0]" artifact]
-     ["[1][0]" repository "_"
+     ["[1][0]" repository
       ["[1]/[0]" local]]]]]])
 
 (def: .public random
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 34afe63bd..35ebfe382 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -24,7 +24,7 @@
     ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]]]
-   ["[0]" time
+   ["[0]" time (.only)
     ["[0]" date]
     ["[0]" year]
     ["[0]" month]
@@ -33,20 +33,20 @@
    [world
     ["[0]" file]
     ["[0]" program]]]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" artifact
    ["[1]/[0]" type]
    ["[1]/[0]" time]
-   ["[1]/[0]" snapshot "_"
+   ["[1]/[0]" snapshot
     ["[1]/[0]" version]]]]
  [\\program
-  ["[0]" /
-   ["/[1]" //
-    ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
+    ["/[1]" //
      [artifact
       [versioning (.only Versioning)]
       ["[1][0]" snapshot]]
-     ["[1][0]" repository "_"
+     ["[1][0]" repository
       ["[1]/[0]" local]]]]]])
 
 (def: random_instant
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 6819da2ac..ee8e252dc 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -10,7 +10,7 @@
     ["[0]" try]]
    [data
     ["[0]" product]
-    ["[0]" text
+    ["[0]" text (.only)
      [encoding
       ["[0]" utf8]]]
     [format
@@ -30,8 +30,8 @@
     [data
      ["$[0]" binary]]]]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" profile]
     ["[1][0]" hash ("[1]#[0]" equivalence)]
     ["[1][0]" pom]
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index e1c6dfa08..3fa66502c 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -25,8 +25,8 @@
  [//
   ["@[0]" profile]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" profile]
     ["[1][0]" project (.only Project)]
     ["[1][0]" artifact (.only Artifact)]
diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux
index 1c2dee136..cf91380b9 100644
--- a/stdlib/source/test/aedifex/pom.lux
+++ b/stdlib/source/test/aedifex/pom.lux
@@ -7,7 +7,7 @@
    [control
     ["[0]" try]
     ["[0]" exception]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" xml]]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)]
@@ -18,8 +18,8 @@
  [//
   ["@[0]" profile]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" profile]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 29f2e3633..94900921a 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -25,14 +25,14 @@
     [compiler
      [meta
       [cli
-       ["[0]" compiler
+       ["[0]" compiler (.only)
         ["$[1]" \\test]]]]]]]]
  [//
   ["@[0]" artifact]
   ["@[0]" dependency]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1][0]" runtime]
     ["[1][0]" dependency (.only Dependency)]
     ["[1][0]" format]
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index dda9723f1..bc4cef70a 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -20,8 +20,8 @@
  [//
   ["@[0]" profile]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" profile]]]])
 
 (def: profile
diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux
index e2dc13f1d..f3a287575 100644
--- a/stdlib/source/test/aedifex/repository.lux
+++ b/stdlib/source/test/aedifex/repository.lux
@@ -13,7 +13,7 @@
    [data
     ["[0]" product]
     ["[0]" binary (.only Binary)]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" dictionary (.only Dictionary)]]]
@@ -22,7 +22,7 @@
    [world
     [net
      ["[0]" uri (.only URI)]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" identity]
   ["[1][0]" origin]
   ["[1][0]" local]
@@ -32,9 +32,9 @@
  [\\specification
   ["$[0]" /]]
  [\\program
-  ["[0]" /
+  ["[0]" / (.only)
    ["[0]" remote]
-   ["/[1]" // "_"
+   ["/[1]" //
     ["[1][0]" artifact (.only Version Artifact)
      ["[1]/[0]" extension (.only Extension)]]]]])
 
diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux
index ac472ca0e..ce6164248 100644
--- a/stdlib/source/test/aedifex/repository/remote.lux
+++ b/stdlib/source/test/aedifex/repository/remote.lux
@@ -22,13 +22,13 @@
     ["[0]" random (.only Random)]]
    [world
     [net (.only URL)
-     ["[0]" http "_"
+     ["[0]" http
       ["[1]" client]
       ["[1]/[0]" status]
       ["@[1]" /]]]]]]
  [\\program
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1][0]" identity]]]])
 
 (def: (url_body url)
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index cfa023145..17c2cb04c 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -42,7 +42,7 @@
              ["[0]" meta ("[1]#[0]" monad)
               ["[0]" location ("[1]#[0]" equivalence)]]]]
            ... TODO: Must have 100% coverage on tests.
-           ["[0]" / "_"
+           ["[0]" /
             ["[1][0]" abstract]
             ["[1][0]" control]
             ["[1][0]" data]
@@ -54,7 +54,6 @@
             ["[1][0]" meta]
             ["[1][0]" program]
             ["[1][0]" static]
-            ["[1][0]" target]
             ["[1][0]" test]
             ["[1][0]" time]
             ["[1][0]" tool]
@@ -62,7 +61,7 @@
             ["[1][0]" world]
             ["[1][0]" ffi]
             ["[1][0]" extension]
-            ["[1][0]" target "_"
+            ["[1][0]" target (.only)
              (~~ (.for "{old}" (~~ (.these ["[1]/[0]" jvm]))
                        "JVM" (~~ (.these ["[1]/[0]" jvm]))
                        "JavaScript" (~~ (.these ["[1]/[0]" js]))
@@ -487,7 +486,7 @@
                                        ("lux def module" [[<module/0> <alias>]])
                                        [(<referral> <module/0> (.except <definition>))]]
                                       
-                                      [(.using [<alias> <module/0>' "_"])
+                                      [(.using [<alias> <module/0>'])
                                        ("lux def module" [])
                                        []]
                                       
@@ -503,13 +502,13 @@
                                        [(<referral> <module/0>)
                                         (<referral> <m0/1>)]]
                                       
-                                      [(.using ["[0]" <module/0>' "_"
+                                      [(.using ["[0]" <module/0>'
                                                 ["[1]" <module/1>']])
                                        ("lux def module" [[<m0/1> <module/0>]])
                                        [(<referral> <m0/1>)]]
 
-                                      [(.using ["[0]" <module/0>' "_"
-                                                ["[1]" <module/1>' "_"
+                                      [(.using ["[0]" <module/0>'
+                                                ["[1]" <module/1>'
                                                  ["[2]" <module/2>']]])
                                        ("lux def module" [[<m0/1/2> <module/0>]])
                                        [(<referral> <m0/1/2>)]]
diff --git a/stdlib/source/test/lux/abstract.lux b/stdlib/source/test/lux/abstract.lux
index 426a49cb6..a51e2a2d8 100644
--- a/stdlib/source/test/lux/abstract.lux
+++ b/stdlib/source/test/lux/abstract.lux
@@ -2,19 +2,19 @@
  [library
   [lux (.full)
    ["_" test (.only Test)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" apply]
   ["[1][0]" codec]
-  ["[1][0]" comonad
+  ["[1][0]" comonad (.only)
    ["[1]/[0]" cofree]]
   ["[1][0]" enum]
   ["[1][0]" equivalence]
   ["[1][0]" hash]
   ["[1][0]" mix]
-  ["[1][0]" functor
+  ["[1][0]" functor (.only)
    ["[1]/[0]" contravariant]]
   ["[1][0]" interval]
-  ["[1][0]" monad
+  ["[1][0]" monad (.only)
    ["[1]/[0]" free]]
   ["[1][0]" monoid]
   ["[1][0]" order]
diff --git a/stdlib/source/test/lux/abstract/monoid.lux b/stdlib/source/test/lux/abstract/monoid.lux
index 997a6af4d..76af6f07a 100644
--- a/stdlib/source/test/lux/abstract/monoid.lux
+++ b/stdlib/source/test/lux/abstract/monoid.lux
@@ -10,7 +10,7 @@
      ["[0]" nat]
      ["[0]" int]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     [equivalence (.only Equivalence)]]]])
 
diff --git a/stdlib/source/test/lux/abstract/order.lux b/stdlib/source/test/lux/abstract/order.lux
index 640dc0e8c..9c527ccb3 100644
--- a/stdlib/source/test/lux/abstract/order.lux
+++ b/stdlib/source/test/lux/abstract/order.lux
@@ -14,7 +14,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     [equivalence (.only Equivalence)]]]])
 
diff --git a/stdlib/source/test/lux/control.lux b/stdlib/source/test/lux/control.lux
index 4fe6486f0..3fff75e05 100644
--- a/stdlib/source/test/lux/control.lux
+++ b/stdlib/source/test/lux/control.lux
@@ -2,9 +2,9 @@
  [library
   [lux (.except function)
    ["_" test (.only Test)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" concatenative]
-  ["[1][0]" concurrency "_"
+  ["[1][0]" concurrency
    ["[1]/[0]" actor]
    ["[1]/[0]" atom]
    ["[1]/[0]" frp]
diff --git a/stdlib/source/test/lux/control/concurrency/async.lux b/stdlib/source/test/lux/control/concurrency/async.lux
index 09bff8f88..c6c30199a 100644
--- a/stdlib/source/test/lux/control/concurrency/async.lux
+++ b/stdlib/source/test/lux/control/concurrency/async.lux
@@ -21,7 +21,7 @@
      ["i" int]
      ["[0]" i64]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["[0]" atom (.only Atom)]]]])
 
diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux
index 56497adc2..d58d83231 100644
--- a/stdlib/source/test/lux/control/concurrency/frp.lux
+++ b/stdlib/source/test/lux/control/concurrency/frp.lux
@@ -23,7 +23,7 @@
    [type
     ["[0]" variance]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["[0]" async (.only Async) ("[1]#[0]" monad)]
     ["[0]" atom (.only Atom atom)]]]])
diff --git a/stdlib/source/test/lux/control/concurrency/stm.lux b/stdlib/source/test/lux/control/concurrency/stm.lux
index f9a433146..cfb33f21d 100644
--- a/stdlib/source/test/lux/control/concurrency/stm.lux
+++ b/stdlib/source/test/lux/control/concurrency/stm.lux
@@ -19,7 +19,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["[0]" atom (.only Atom atom)]
     ["[0]" async]
diff --git a/stdlib/source/test/lux/control/concurrency/thread.lux b/stdlib/source/test/lux/control/concurrency/thread.lux
index 12d5143f8..050972a1e 100644
--- a/stdlib/source/test/lux/control/concurrency/thread.lux
+++ b/stdlib/source/test/lux/control/concurrency/thread.lux
@@ -15,7 +15,7 @@
      ["n" nat]
      ["i" int]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["[0]" atom (.only Atom)]
     ["[0]" async]]]])
diff --git a/stdlib/source/test/lux/control/function.lux b/stdlib/source/test/lux/control/function.lux
index 1d8e9c086..9b321bb15 100644
--- a/stdlib/source/test/lux/control/function.lux
+++ b/stdlib/source/test/lux/control/function.lux
@@ -13,7 +13,7 @@
      ["n" nat]]]]]
  [\\library
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" contract]
   ["[1][0]" memo]
   ["[1][0]" mixin]
diff --git a/stdlib/source/test/lux/control/function/memo.lux b/stdlib/source/test/lux/control/function/memo.lux
index ed0195bcb..67cdb6c3c 100644
--- a/stdlib/source/test/lux/control/function/memo.lux
+++ b/stdlib/source/test/lux/control/function/memo.lux
@@ -23,8 +23,8 @@
     ["[0]" instant]
     ["[0]" duration (.only Duration)]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" mixin]]]])
 
 (def: (fibonacci again input)
diff --git a/stdlib/source/test/lux/control/parser.lux b/stdlib/source/test/lux/control/parser.lux
index 3fb9b074b..8c3cd9047 100644
--- a/stdlib/source/test/lux/control/parser.lux
+++ b/stdlib/source/test/lux/control/parser.lux
@@ -27,7 +27,7 @@
     ["[0]" code]]]]
  [\\library
   ["[0]" / (.only Parser)]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" analysis]
   ["[1][0]" binary]
   ["[1][0]" cli]
diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux
index 78218cdd4..006eff5ed 100644
--- a/stdlib/source/test/lux/control/parser/binary.lux
+++ b/stdlib/source/test/lux/control/parser/binary.lux
@@ -21,7 +21,7 @@
      ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary]]
     [collection
      ["[0]" list]
diff --git a/stdlib/source/test/lux/control/parser/environment.lux b/stdlib/source/test/lux/control/parser/environment.lux
index 959a2603b..a74f51ccd 100644
--- a/stdlib/source/test/lux/control/parser/environment.lux
+++ b/stdlib/source/test/lux/control/parser/environment.lux
@@ -16,7 +16,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" // ("[1]#[0]" monad)]]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/control/parser/text.lux b/stdlib/source/test/lux/control/parser/text.lux
index 41d92a3be..a9ae968ec 100644
--- a/stdlib/source/test/lux/control/parser/text.lux
+++ b/stdlib/source/test/lux/control/parser/text.lux
@@ -12,7 +12,7 @@
    [data
     ["[0]" text ("[1]#[0]" equivalence)
      ["%" format (.only format)]
-     ["[0]" unicode "_"
+     ["[0]" unicode
       ["[1]" set]
       ["[1]/[0]" block]]]
     [collection
@@ -28,8 +28,8 @@
     ["^" pattern]
     ["[0]" code]]]]
  [\\library
-  ["[0]" /
-   ["<>" //
+  ["[0]" / (.only)
+   ["<>" // (.only)
     ["<c>" code]]]])
 
 (template: (!expect <pattern> <value>)
diff --git a/stdlib/source/test/lux/control/parser/tree.lux b/stdlib/source/test/lux/control/parser/tree.lux
index 6ec6dc06f..8253af8bc 100644
--- a/stdlib/source/test/lux/control/parser/tree.lux
+++ b/stdlib/source/test/lux/control/parser/tree.lux
@@ -9,7 +9,7 @@
     ["[0]" exception]]
    [data
     [collection
-     ["[0]" tree
+     ["[0]" tree (.only)
       ["[0]" zipper]]]]
    [macro
     ["^" pattern]]
@@ -18,7 +18,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (template: (!expect <pattern> <value>)
diff --git a/stdlib/source/test/lux/control/parser/type.lux b/stdlib/source/test/lux/control/parser/type.lux
index 0ccc6a706..d4909695a 100644
--- a/stdlib/source/test/lux/control/parser/type.lux
+++ b/stdlib/source/test/lux/control/parser/type.lux
@@ -22,7 +22,7 @@
    [meta
     ["[0]" symbol ("[1]#[0]" equivalence)]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (template: (!expect <pattern> <value>)
diff --git a/stdlib/source/test/lux/control/parser/xml.lux b/stdlib/source/test/lux/control/parser/xml.lux
index 9a5b17db8..8d29bdfeb 100644
--- a/stdlib/source/test/lux/control/parser/xml.lux
+++ b/stdlib/source/test/lux/control/parser/xml.lux
@@ -25,7 +25,7 @@
    [meta
     ["[0]" symbol ("[1]#[0]" equivalence)]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" // ("[1]#[0]" monad)]]])
 
 (template: (!expect <pattern> <value>)
diff --git a/stdlib/source/test/lux/control/remember.lux b/stdlib/source/test/lux/control/remember.lux
index 758a8e1f3..4a10b2934 100644
--- a/stdlib/source/test/lux/control/remember.lux
+++ b/stdlib/source/test/lux/control/remember.lux
@@ -13,7 +13,7 @@
      ["<[0]>" code]]]
    [data
     ["[0]" product]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]]
    [math
     [number (.only hex)]
@@ -22,7 +22,7 @@
     ["[0]" date (.only Date)]
     ["[0]" instant]
     ["[0]" duration]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     ["[0]" code]
     ["[0]" syntax (.only syntax:)]]]]
  [\\library
diff --git a/stdlib/source/test/lux/data.lux b/stdlib/source/test/lux/data.lux
index e4b284bbe..b24847add 100644
--- a/stdlib/source/test/lux/data.lux
+++ b/stdlib/source/test/lux/data.lux
@@ -6,16 +6,16 @@
     [monad (.only do)]]
    [math
     ["[0]" random]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" binary]
   ["[1][0]" bit]
-  ["[1][0]" color
+  ["[1][0]" color (.only)
    ["[1]/[0]" named]]
   ["[1][0]" identity]
   ["[1][0]" product]
   ["[1][0]" sum]
   ["[1][0]" text]
-  ["[1][0]" format "_"
+  ["[1][0]" format
    ["[1]/[0]" binary]
    ["[1]/[0]" json]
    ["[1]/[0]" tar]
diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index ef32b9210..51a0599d8 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -23,7 +23,7 @@
      ["n" nat]
      ["[0]" i64]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["!" \\unsafe]]])
 
 (def: (succeed result)
diff --git a/stdlib/source/test/lux/data/collection.lux b/stdlib/source/test/lux/data/collection.lux
index f413c5d63..1ad77e1d3 100644
--- a/stdlib/source/test/lux/data/collection.lux
+++ b/stdlib/source/test/lux/data/collection.lux
@@ -2,22 +2,22 @@
  [library
   [lux (.full)
    ["_" test (.only Test)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" array]
   ["[1][0]" bits]
   ["[1][0]" list]
   ["[1][0]" sequence]
   ["[1][0]" stream]
   ["[1][0]" stack]
-  ["[1][0]" dictionary
+  ["[1][0]" dictionary (.only)
    ["[1]/[0]" ordered]
    ["[1]/[0]" plist]]
-  ["[1][0]" queue
+  ["[1][0]" queue (.only)
    ["[1]/[0]" priority]]
-  ["[1][0]" set
+  ["[1][0]" set (.only)
    ["[1]/[0]" multi]
    ["[1]/[0]" ordered]]
-  ["[1][0]" tree
+  ["[1][0]" tree (.only)
    ["[1]/[0]" finger]
    ["[1]/[0]" zipper]]])
 
diff --git a/stdlib/source/test/lux/data/collection/stream.lux b/stdlib/source/test/lux/data/collection/stream.lux
index e21be7f10..327ed0a1c 100644
--- a/stdlib/source/test/lux/data/collection/stream.lux
+++ b/stdlib/source/test/lux/data/collection/stream.lux
@@ -10,7 +10,7 @@
      ["$[0]" functor]
      ["$[0]" comonad]]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]
diff --git a/stdlib/source/test/lux/data/color/named.lux b/stdlib/source/test/lux/data/color/named.lux
index 9e95d4155..7f35264cd 100644
--- a/stdlib/source/test/lux/data/color/named.lux
+++ b/stdlib/source/test/lux/data/color/named.lux
@@ -15,7 +15,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (with_expansions [<colors> (these [letter/a
diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index 0cb47de9f..13ade92c7 100644
--- a/stdlib/source/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
@@ -13,7 +13,7 @@
    [data
     ["[0]" product]
     ["[0]" bit]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" sequence]
@@ -25,7 +25,7 @@
     [number
      ["n" nat]
      ["[0]" frac]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     ["[0]" syntax (.only syntax:)]
     ["[0]" code]]]]
  [\\library
diff --git a/stdlib/source/test/lux/data/format/tar.lux b/stdlib/source/test/lux/data/format/tar.lux
index fbc51ac82..6e35a347b 100644
--- a/stdlib/source/test/lux/data/format/tar.lux
+++ b/stdlib/source/test/lux/data/format/tar.lux
@@ -8,7 +8,7 @@
     ["[0]" maybe]
     ["[0]" try]
     ["[0]" exception]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<b>" binary]]]
    [data
     ["[0]" product]
@@ -17,13 +17,13 @@
      ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]
-     ["[0]" unicode "_"
+     ["[0]" unicode
       ["[1]" set]
       ["[1]/[0]" block]]]
     [collection
      ["[0]" sequence]
      ["[0]" list ("[1]#[0]" mix)]]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary]]]
    [time
     ["[0]" instant (.only Instant)]
diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index 8c2de7623..2a3a3f919 100644
--- a/stdlib/source/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
@@ -20,13 +20,13 @@
     ["[0]" random]
     [number
      ["n" nat]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" buffer]
   ["[1][0]" encoding]
   ["[1][0]" format]
   ["[1][0]" regex]
   ["[1][0]" escape]
-  ["[1][0]" unicode "_"
+  ["[1][0]" unicode
    ["[1]" set]]]
  [\\library
   ["[0]" /]])
diff --git a/stdlib/source/test/lux/data/text/encoding.lux b/stdlib/source/test/lux/data/text/encoding.lux
index cfeb536c4..227b1363f 100644
--- a/stdlib/source/test/lux/data/text/encoding.lux
+++ b/stdlib/source/test/lux/data/text/encoding.lux
@@ -22,7 +22,7 @@
      ["n" nat]]]]]
  [\\library
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" utf8]])
 
 (with_expansions [<encodings> (these [all/a
diff --git a/stdlib/source/test/lux/data/text/escape.lux b/stdlib/source/test/lux/data/text/escape.lux
index a633bcf48..c3e08062d 100644
--- a/stdlib/source/test/lux/data/text/escape.lux
+++ b/stdlib/source/test/lux/data/text/escape.lux
@@ -26,9 +26,9 @@
     [number (.only hex)
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
-    ["[0]" unicode "_"
+    ["[0]" unicode
      ["[1]" set]]]]])
 
 (def: (range max min)
diff --git a/stdlib/source/test/lux/data/text/format.lux b/stdlib/source/test/lux/data/text/format.lux
index 16efbdc30..8a0b6e22d 100644
--- a/stdlib/source/test/lux/data/text/format.lux
+++ b/stdlib/source/test/lux/data/text/format.lux
@@ -18,7 +18,7 @@
      ["[0]" json]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]]]
-   ["[0]" time
+   ["[0]" time (.only)
     ["[0]" day]
     ["[0]" month]
     ["[0]" instant]
@@ -40,7 +40,7 @@
     ["[0]" location]
     ["[0]" symbol]]
    ["[0]" type]]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   [format
    ["[1][0]" xml]
    ["[1][0]" json]]
diff --git a/stdlib/source/test/lux/data/text/regex.lux b/stdlib/source/test/lux/data/text/regex.lux
index 068831ce4..e37fb04a6 100644
--- a/stdlib/source/test/lux/data/text/regex.lux
+++ b/stdlib/source/test/lux/data/text/regex.lux
@@ -13,7 +13,7 @@
    [data
     ["[0]" text ("[1]#[0]" equivalence)
      ["%" format (.only format)]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]]
    [math
diff --git a/stdlib/source/test/lux/data/text/unicode/set.lux b/stdlib/source/test/lux/data/text/unicode/set.lux
index 07eff4181..dcdb34d34 100644
--- a/stdlib/source/test/lux/data/text/unicode/set.lux
+++ b/stdlib/source/test/lux/data/text/unicode/set.lux
@@ -15,11 +15,11 @@
     ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
- ["[0]" / "_"
-  ["/[1]" // "_"
+ ["[0]" /
+  ["/[1]" //
    ["[1][0]" block]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["[0]" block]]]])
 
diff --git a/stdlib/source/test/lux/debug.lux b/stdlib/source/test/lux/debug.lux
index ebebc24e6..30aba1af9 100644
--- a/stdlib/source/test/lux/debug.lux
+++ b/stdlib/source/test/lux/debug.lux
@@ -18,7 +18,7 @@
     [format
      [json (.only JSON)]
      [xml (.only XML)]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]]
    [math
@@ -33,7 +33,7 @@
     [day (.only Day)]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" // "_"
+ ["$[0]" //
   ["[1][0]" type]
   [data
    [format
diff --git a/stdlib/source/test/lux/documentation.lux b/stdlib/source/test/lux/documentation.lux
index 847db7a02..5c25f6368 100644
--- a/stdlib/source/test/lux/documentation.lux
+++ b/stdlib/source/test/lux/documentation.lux
@@ -13,7 +13,7 @@
      ["%" format]]
     [format
      ["md" markdown]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" template]
     ["[0]" code]]]]
diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux
index 069483d09..34b33a60c 100644
--- a/stdlib/source/test/lux/extension.lux
+++ b/stdlib/source/test/lux/extension.lux
@@ -2,14 +2,14 @@
            [library
             [lux (.full)
              ["[0]" debug]
-             ["@" target
+             ["@" target (.only)
               ["[0]" js]
               ["[0]" python]
               ["[0]" lua]
               ["[0]" ruby]
               ["[0]" php]
               ["[0]" scheme]
-              ["[0]" jvm "_"
+              ["[0]" jvm
                (~~ (.for "JVM" (~~ (.these ["[1]" bytecode]
                                            ["[0]" class]
                                            ["[0]" version]
@@ -20,7 +20,7 @@
               ["[0]" monad (.only do)]]
              [control
               ["[0]" try ("[1]#[0]" functor)]
-              ["<>" parser
+              ["<>" parser (.only)
                ["<[0]>" code]
                ["<[0]>" analysis]
                ["<[0]>" synthesis]]]
@@ -51,11 +51,11 @@
                  ["[0]" synthesis]
                  ["[0]" generation]
                  ["[0]" directive]
-                 ["[0]" analysis
+                 ["[0]" analysis (.only)
                   ["[0]" type]]
                  [phase
                   [generation
-                   (~~ (.for "JVM" (~~ (.these ["[0]" jvm "_"
+                   (~~ (.for "JVM" (~~ (.these ["[0]" jvm
                                                 ["[1]/[0]" runtime]]))
                              (~~ (.these))))]]]]]]
              ["_" test (.only Test)]]]
diff --git a/stdlib/source/test/lux/ffi.js.lux b/stdlib/source/test/lux/ffi.js.lux
index 6b33ab0c1..db89ac62b 100644
--- a/stdlib/source/test/lux/ffi.js.lux
+++ b/stdlib/source/test/lux/ffi.js.lux
@@ -16,7 +16,7 @@
      ["[0]" frac]]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" / "_"
+ ["$[0]" /
   ["[1][0]" export]])
 
 (/.import: Uint8Array
diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux
index 14cf56a54..793a4fcf2 100644
--- a/stdlib/source/test/lux/ffi.jvm.lux
+++ b/stdlib/source/test/lux/ffi.jvm.lux
@@ -20,7 +20,7 @@
      ["%" format (.only format)]]
     [collection
      ["[0]" array (.only Array)]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]
@@ -32,11 +32,11 @@
      ["i" int ("[1]#[0]" equivalence)]
      ["f" frac ("[1]#[0]" equivalence)]]]
    [target
-    ["[0]" jvm "_"
+    ["[0]" jvm
      ["[1]" type ("[1]#[0]" equivalence)]]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" / "_"
+ ["$[0]" /
   ["[1][0]" export]])
 
 (/.import: java/lang/Boolean
diff --git a/stdlib/source/test/lux/ffi.lua.lux b/stdlib/source/test/lux/ffi.lua.lux
index 4f96bfb27..9b58115b7 100644
--- a/stdlib/source/test/lux/ffi.lua.lux
+++ b/stdlib/source/test/lux/ffi.lua.lux
@@ -10,7 +10,7 @@
     ["[0]" random]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" / "_"
+ ["$[0]" /
   ["[1][0]" export]])
 
 (/.import: (os/getenv [/.String] "io" "?" /.String))
diff --git a/stdlib/source/test/lux/ffi.py.lux b/stdlib/source/test/lux/ffi.py.lux
index 2920af523..030db7d70 100644
--- a/stdlib/source/test/lux/ffi.py.lux
+++ b/stdlib/source/test/lux/ffi.py.lux
@@ -10,7 +10,7 @@
      ["i" int]]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" / "_"
+ ["$[0]" /
   ["[1][0]" export]])
 
 (/.import: os
diff --git a/stdlib/source/test/lux/ffi.rb.lux b/stdlib/source/test/lux/ffi.rb.lux
index 11cc009cf..e902fdbac 100644
--- a/stdlib/source/test/lux/ffi.rb.lux
+++ b/stdlib/source/test/lux/ffi.rb.lux
@@ -8,7 +8,7 @@
     ["[0]" random]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" / "_"
+ ["$[0]" /
   ["[1][0]" export]])
 
 (/.import: File
diff --git a/stdlib/source/test/lux/ffi/export.js.lux b/stdlib/source/test/lux/ffi/export.js.lux
index 2e3a99a78..0bb40db7e 100644
--- a/stdlib/source/test/lux/ffi/export.js.lux
+++ b/stdlib/source/test/lux/ffi/export.js.lux
@@ -7,7 +7,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (with_expansions [<nat> (static.random_nat)]
diff --git a/stdlib/source/test/lux/ffi/export.jvm.lux b/stdlib/source/test/lux/ffi/export.jvm.lux
index 4cf439109..ca8270a46 100644
--- a/stdlib/source/test/lux/ffi/export.jvm.lux
+++ b/stdlib/source/test/lux/ffi/export.jvm.lux
@@ -21,7 +21,7 @@
      ["[0]" int ("[1]#[0]" equivalence)]
      ["[0]" frac ("[1]#[0]" equivalence)]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (def: expected_boolean (//.as_boolean (static.random_bit)))
diff --git a/stdlib/source/test/lux/ffi/export.lua.lux b/stdlib/source/test/lux/ffi/export.lua.lux
index 45ce89903..94caf19fb 100644
--- a/stdlib/source/test/lux/ffi/export.lua.lux
+++ b/stdlib/source/test/lux/ffi/export.lua.lux
@@ -7,7 +7,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (with_expansions [<nat> (static.random_nat)]
diff --git a/stdlib/source/test/lux/ffi/export.py.lux b/stdlib/source/test/lux/ffi/export.py.lux
index 2e3a99a78..0bb40db7e 100644
--- a/stdlib/source/test/lux/ffi/export.py.lux
+++ b/stdlib/source/test/lux/ffi/export.py.lux
@@ -7,7 +7,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (with_expansions [<nat> (static.random_nat)]
diff --git a/stdlib/source/test/lux/ffi/export.rb.lux b/stdlib/source/test/lux/ffi/export.rb.lux
index 5a0be82c1..3e1729edd 100644
--- a/stdlib/source/test/lux/ffi/export.rb.lux
+++ b/stdlib/source/test/lux/ffi/export.rb.lux
@@ -7,7 +7,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (with_expansions [<nat> (static.random_nat)]
diff --git a/stdlib/source/test/lux/locale.lux b/stdlib/source/test/lux/locale.lux
index e46cdcac0..cf659e163 100644
--- a/stdlib/source/test/lux/locale.lux
+++ b/stdlib/source/test/lux/locale.lux
@@ -14,11 +14,11 @@
      ["[0]" encoding (.only Encoding)]]
     [collection
      ["[0]" list]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" language]
   ["[1][0]" territory]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["[0]" language (.only Language)]
    ["[0]" territory (.only Territory)]]])
 
diff --git a/stdlib/source/test/lux/macro.lux b/stdlib/source/test/lux/macro.lux
index 384f0b831..5f1b39ff2 100644
--- a/stdlib/source/test/lux/macro.lux
+++ b/stdlib/source/test/lux/macro.lux
@@ -11,7 +11,7 @@
      ["<[0]>" code]]]
    [data
     ["[0]" bit ("[1]#[0]" equivalence)]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list]]]
@@ -21,15 +21,15 @@
     ["[0]" random (.only Random) ("[1]#[0]" functor)]
     [number
      ["n" nat]]]
-   ["[0]" meta
+   ["[0]" meta (.only)
     ["[0]" location]
     ["[0]" symbol]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [syntax (.only syntax:)]
    ["[0]" code ("[1]#[0]" equivalence)]
    ["[0]" template]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" code]
   ["[1][0]" local]
   ["[1][0]" syntax]
diff --git a/stdlib/source/test/lux/macro/local.lux b/stdlib/source/test/lux/macro/local.lux
index 9af43e8a4..79c0688c5 100644
--- a/stdlib/source/test/lux/macro/local.lux
+++ b/stdlib/source/test/lux/macro/local.lux
@@ -8,7 +8,7 @@
    [control
     ["[0]" try]
     ["[0]" exception]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" code]]]
    [data
     [text
@@ -17,7 +17,7 @@
      ["[0]" list]
      [dictionary
       ["[0]" plist]]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]]
    [math
diff --git a/stdlib/source/test/lux/macro/syntax.lux b/stdlib/source/test/lux/macro/syntax.lux
index 9c094d3ea..bf072f679 100644
--- a/stdlib/source/test/lux/macro/syntax.lux
+++ b/stdlib/source/test/lux/macro/syntax.lux
@@ -13,13 +13,13 @@
      ["n" nat]]]]]
  [\\library
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" check]
   ["[1][0]" declaration]
   ["[1][0]" definition]
   ["[1][0]" export]
   ["[1][0]" input]
-  ["[1][0]" type "_"
+  ["[1][0]" type
    ["[1]/[0]" variable]]])
 
 (/.syntax: (+/3 [a <code>.any
diff --git a/stdlib/source/test/lux/macro/syntax/check.lux b/stdlib/source/test/lux/macro/syntax/check.lux
index 9306672d0..f5ec2a9ae 100644
--- a/stdlib/source/test/lux/macro/syntax/check.lux
+++ b/stdlib/source/test/lux/macro/syntax/check.lux
@@ -8,7 +8,7 @@
      ["$[0]" equivalence]]]
    [control
     ["[0]" try]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" code]]]
    [math
     ["[0]" random (.only Random)]]
@@ -16,7 +16,7 @@
     ["[0]" code ("[1]#[0]" equivalence)]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" code]])
 
 (def: .public random
diff --git a/stdlib/source/test/lux/macro/syntax/definition.lux b/stdlib/source/test/lux/macro/syntax/definition.lux
index 1947d0ad1..a657bb83f 100644
--- a/stdlib/source/test/lux/macro/syntax/definition.lux
+++ b/stdlib/source/test/lux/macro/syntax/definition.lux
@@ -9,7 +9,7 @@
    [control
     ["[0]" try]
     ["[0]" exception]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" code]]]
    [macro
     ["[0]" code ("[1]#[0]" equivalence)]]
@@ -19,9 +19,9 @@
     ["[0]" location]]]]
  [\\library
   ["[0]" /]]
- ["$[0]"// "_"
+ ["$[0]"//
   ["[1][0]" check]
-  ["[1]/" // "_"
+  ["[1]/" //
    ["[1][0]" code]]])
 
 (def: .public random
diff --git a/stdlib/source/test/lux/macro/syntax/input.lux b/stdlib/source/test/lux/macro/syntax/input.lux
index 28e669496..a7f94d4bd 100644
--- a/stdlib/source/test/lux/macro/syntax/input.lux
+++ b/stdlib/source/test/lux/macro/syntax/input.lux
@@ -19,7 +19,7 @@
      ["n" nat]]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" code]])
 
 (def: .public random
diff --git a/stdlib/source/test/lux/macro/template.lux b/stdlib/source/test/lux/macro/template.lux
index 0be375703..eb5d1de14 100644
--- a/stdlib/source/test/lux/macro/template.lux
+++ b/stdlib/source/test/lux/macro/template.lux
@@ -12,7 +12,7 @@
    [data
     [collection
      ["[0]" list]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]]
    [math
diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux
index 33f79592b..3164ce3ff 100644
--- a/stdlib/source/test/lux/math.lux
+++ b/stdlib/source/test/lux/math.lux
@@ -19,12 +19,12 @@
      ["[0]" complex (.only Complex)]]]]]
  [\\library
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" infix]
   ["[1][0]" modulus]
   ["[1][0]" modular]
   ["[1][0]" number]
-  ["[1][0]" logic "_"
+  ["[1][0]" logic
    ["[1]/[0]" continuous]
    ["[1]/[0]" fuzzy]]])
 
diff --git a/stdlib/source/test/lux/math/logic/fuzzy.lux b/stdlib/source/test/lux/math/logic/fuzzy.lux
index 22ac0156a..b1f4686a5 100644
--- a/stdlib/source/test/lux/math/logic/fuzzy.lux
+++ b/stdlib/source/test/lux/math/logic/fuzzy.lux
@@ -20,7 +20,7 @@
      ["r" rev]]]]]
  [\\library
   ["[0]" / (.only Fuzzy)
-   ["/[1]" // "_"
+   ["/[1]" //
     ["[1]" continuous]]]])
 
 (def: trivial
diff --git a/stdlib/source/test/lux/math/modular.lux b/stdlib/source/test/lux/math/modular.lux
index 0ebfe2ee2..51e189e71 100644
--- a/stdlib/source/test/lux/math/modular.lux
+++ b/stdlib/source/test/lux/math/modular.lux
@@ -21,11 +21,11 @@
     ["[0]" random (.only Random)]
     [number
      ["i" int]]]]]
- ["$[0]" // "_"
+ ["$[0]" //
   ["[1]" modulus]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1]" modulus]]]])
 
 (def: .public (random modulus)
diff --git a/stdlib/source/test/lux/math/number.lux b/stdlib/source/test/lux/math/number.lux
index 0466f5049..62e385597 100644
--- a/stdlib/source/test/lux/math/number.lux
+++ b/stdlib/source/test/lux/math/number.lux
@@ -7,12 +7,12 @@
    [data
     ["[0]" text]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["n" nat]
    ["i" int]
    ["r" rev]
    ["f" frac]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" i8]
   ["[1][0]" i16]
   ["[1][0]" i32]
diff --git a/stdlib/source/test/lux/math/number/complex.lux b/stdlib/source/test/lux/math/number/complex.lux
index 87371ec78..fe6aad7d8 100644
--- a/stdlib/source/test/lux/math/number/complex.lux
+++ b/stdlib/source/test/lux/math/number/complex.lux
@@ -12,7 +12,7 @@
    [math
     ["[0]" random (.only Random)]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["n" nat]
     ["f" frac]
diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux
index f0c25394f..a200056ad 100644
--- a/stdlib/source/test/lux/math/number/frac.lux
+++ b/stdlib/source/test/lux/math/number/frac.lux
@@ -19,7 +19,7 @@
    [math
     ["[0]" random (.only Random)]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [// (.full)
     ["n" nat]
     ["i" int]
diff --git a/stdlib/source/test/lux/math/number/i16.lux b/stdlib/source/test/lux/math/number/i16.lux
index 6a9fbc7cd..60009e256 100644
--- a/stdlib/source/test/lux/math/number/i16.lux
+++ b/stdlib/source/test/lux/math/number/i16.lux
@@ -9,8 +9,8 @@
    [math
     ["[0]" random (.only Random)]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["i" int]
     ["[1][0]" i64]]]])
 
diff --git a/stdlib/source/test/lux/math/number/i32.lux b/stdlib/source/test/lux/math/number/i32.lux
index d2eb27dfd..02f6a365c 100644
--- a/stdlib/source/test/lux/math/number/i32.lux
+++ b/stdlib/source/test/lux/math/number/i32.lux
@@ -9,8 +9,8 @@
    [math
     ["[0]" random (.only Random)]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["i" int]
     ["[1][0]" i64]]]])
 
diff --git a/stdlib/source/test/lux/math/number/i8.lux b/stdlib/source/test/lux/math/number/i8.lux
index a481de011..1ab7401b1 100644
--- a/stdlib/source/test/lux/math/number/i8.lux
+++ b/stdlib/source/test/lux/math/number/i8.lux
@@ -9,8 +9,8 @@
    [math
     ["[0]" random (.only Random)]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["i" int]
     ["[1][0]" i64]]]])
 
diff --git a/stdlib/source/test/lux/math/number/int.lux b/stdlib/source/test/lux/math/number/int.lux
index fc5242986..542a1ff48 100644
--- a/stdlib/source/test/lux/math/number/int.lux
+++ b/stdlib/source/test/lux/math/number/int.lux
@@ -17,7 +17,7 @@
    [math
     ["[0]" random (.only Random)]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["n" nat]
     ["f" frac]
diff --git a/stdlib/source/test/lux/math/number/nat.lux b/stdlib/source/test/lux/math/number/nat.lux
index 76819860f..f5020a06b 100644
--- a/stdlib/source/test/lux/math/number/nat.lux
+++ b/stdlib/source/test/lux/math/number/nat.lux
@@ -17,7 +17,7 @@
    [math
     ["[0]" random]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["f" frac]]]])
 
diff --git a/stdlib/source/test/lux/math/number/ratio.lux b/stdlib/source/test/lux/math/number/ratio.lux
index 5f6725932..9e808e35e 100644
--- a/stdlib/source/test/lux/math/number/ratio.lux
+++ b/stdlib/source/test/lux/math/number/ratio.lux
@@ -16,7 +16,7 @@
    [math
     ["[0]" random (.only Random)]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["n" nat ("[1]#[0]" equivalence)]]]])
 
diff --git a/stdlib/source/test/lux/math/number/rev.lux b/stdlib/source/test/lux/math/number/rev.lux
index 4036f6fd2..6fa030995 100644
--- a/stdlib/source/test/lux/math/number/rev.lux
+++ b/stdlib/source/test/lux/math/number/rev.lux
@@ -17,7 +17,7 @@
    [math
     ["[0]" random]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [// (.only hex)
     ["n" nat]
     ["f" frac]
diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux
index dfb47ac4b..f55583a1f 100644
--- a/stdlib/source/test/lux/meta.lux
+++ b/stdlib/source/test/lux/meta.lux
@@ -32,7 +32,7 @@
     ["[0]" symbol ("[1]#[0]" equivalence)]]]]
  [\\library
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" location]
   ["[1][0]" symbol]
   ["[1][0]" configuration]
diff --git a/stdlib/source/test/lux/meta/configuration.lux b/stdlib/source/test/lux/meta/configuration.lux
index b5fe77369..de8a402be 100644
--- a/stdlib/source/test/lux/meta/configuration.lux
+++ b/stdlib/source/test/lux/meta/configuration.lux
@@ -11,14 +11,14 @@
    [control
     ["[0]" try ("[1]#[0]" functor)]
     ["[0]" exception]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" text]
      ["<[0]>" code]]]
    [data
     ["[0]" text]
     [collection
      ["[0]" list]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]]
    [math
diff --git a/stdlib/source/test/lux/meta/location.lux b/stdlib/source/test/lux/meta/location.lux
index f607643b7..1891deb66 100644
--- a/stdlib/source/test/lux/meta/location.lux
+++ b/stdlib/source/test/lux/meta/location.lux
@@ -12,7 +12,7 @@
     ["[0]" random (.only Random)]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   [macro
    ["[1][0]" code]]])
 
diff --git a/stdlib/source/test/lux/meta/version.lux b/stdlib/source/test/lux/meta/version.lux
index 939205c38..4ccdf6163 100644
--- a/stdlib/source/test/lux/meta/version.lux
+++ b/stdlib/source/test/lux/meta/version.lux
@@ -13,7 +13,7 @@
      ["<[0]>" code]]]
    [data
     ["[0]" text]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]]
    [math
diff --git a/stdlib/source/test/lux/program.lux b/stdlib/source/test/lux/program.lux
index 2f5e9882e..854ef3a4b 100644
--- a/stdlib/source/test/lux/program.lux
+++ b/stdlib/source/test/lux/program.lux
@@ -7,7 +7,7 @@
    [control
     ["[0]" io]
     ["[0]" try]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" code]
      ["<[0]>" cli]]]
    [data
diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux
index c970bbab0..0dddacfb5 100644
--- a/stdlib/source/test/lux/target/jvm.lux
+++ b/stdlib/source/test/lux/target/jvm.lux
@@ -16,7 +16,7 @@
     ["[0]" bit ("[1]#[0]" equivalence)]
     ["[0]" text ("[1]#[0]" equivalence)
      ["%" format (.only format)]]
-    ["[0]" format "_"
+    ["[0]" format
      ["[1]" binary]]
     [collection
      ["[0]" array]
@@ -34,16 +34,16 @@
      ["[0]" i64]]]
    ["_" test (.only Test)]]]
  [\\library
-  ["[0]" / "_"
+  ["[0]" /
    ["[1][0]" loader (.only Library)]
    ["[1][0]" version]
    ["[1][0]" modifier ("[1]#[0]" monoid)]
    ["[1][0]" field]
    ["[1][0]" method (.only Method)]
    ["[1][0]" class]
-   ["[1][0]" attribute
+   ["[1][0]" attribute (.only)
     ["[1]/[0]" code]]
-   ["[1][0]" constant
+   ["[1][0]" constant (.only)
     ["[1]/[0]" pool (.only Resource)]]
    [encoding
     ["[1][0]" name]
diff --git a/stdlib/source/test/lux/target/ruby.lux b/stdlib/source/test/lux/target/ruby.lux
index a789477c1..8745dcbac 100644
--- a/stdlib/source/test/lux/target/ruby.lux
+++ b/stdlib/source/test/lux/target/ruby.lux
@@ -30,7 +30,7 @@
    [tool
     [compiler
      [meta
-      ["[0]" packager "_"
+      ["[0]" packager
        ["[1]" ruby]]]]]
    [world
     ["[0]" file]]]]
diff --git a/stdlib/source/test/lux/time.lux b/stdlib/source/test/lux/time.lux
index be3a878e8..9bd65e58f 100644
--- a/stdlib/source/test/lux/time.lux
+++ b/stdlib/source/test/lux/time.lux
@@ -16,13 +16,13 @@
     [parser
      ["<[0]>" text]]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]]
    [math
     ["[0]" random]
     [number
      ["n" nat]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" date]
   ["[1][0]" day]
   ["[1][0]" duration]
@@ -30,7 +30,7 @@
   ["[1][0]" month]
   ["[1][0]" year]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["[0]" duration]]])
 
 (def: for_implementation
diff --git a/stdlib/source/test/lux/time/month.lux b/stdlib/source/test/lux/time/month.lux
index ff3144e24..4515e8685 100644
--- a/stdlib/source/test/lux/time/month.lux
+++ b/stdlib/source/test/lux/time/month.lux
@@ -23,7 +23,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["[0]" duration]]]])
 
diff --git a/stdlib/source/test/lux/time/year.lux b/stdlib/source/test/lux/time/year.lux
index 5f3c342f6..43284c86e 100644
--- a/stdlib/source/test/lux/time/year.lux
+++ b/stdlib/source/test/lux/time/year.lux
@@ -21,8 +21,8 @@
      ["n" nat]
      ["i" int]]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     ["[1][0]" duration]
     ["[1][0]" instant]
     ["[1][0]" date]]]])
diff --git a/stdlib/source/test/lux/tool.lux b/stdlib/source/test/lux/tool.lux
index 7d0924fcc..f6bbb7a57 100644
--- a/stdlib/source/test/lux/tool.lux
+++ b/stdlib/source/test/lux/tool.lux
@@ -2,7 +2,7 @@
  [library
   [lux (.full)
    ["_" test (.only Test)]]]
- ["[0]" / "_"
+ ["[0]" /
   [compiler
    ["[1][0]" arity]
    ["[1][0]" version]
@@ -12,15 +12,15 @@
     [lux
      ... ["[1][0]" syntax]
      ["[1][0]" analysis]
-     ["[1][0]" synthesis "_"
+     ["[1][0]" synthesis
       ["[1]/[0]" simple]
       ["[1]/[0]" access]]
-     ["[1][0]" phase "_"
+     ["[1][0]" phase
       ["[1]/[0]" extension]
       ["[1]/[0]" analysis]
       ... ["[1]/[0]" synthesis]
       ]]]
-   ["[1][0]" meta "_"
+   ["[1][0]" meta
     ["[1]/[0]" archive]
     ["[1]/[0]" cli]
     ["[1]/[0]" export]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux
index 93a281799..171efdafd 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis.lux
@@ -25,9 +25,9 @@
     [number
      ["f" frac]]]
    [meta
-    ["[0]" configuration "_"
+    ["[0]" configuration
      ["$[1]" \\test]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" complex]
   ["[1][0]" inference]
   ["[1][0]" macro]
@@ -38,16 +38,16 @@
   ["[1][0]" type]
   ["[1][0]" coverage]
   [////
-   ["[1][0]" reference
+   ["[1][0]" reference (.only)
     ["[2][0]" variable]]
    [///
     [meta
      ["[1][0]" symbol]
-     ["[0]" location "_"
+     ["[0]" location
       ["[2][1]" /]
       ["[1]" \\library ("[1]#[0]" equivalence)]]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     [phase
      ["[0]" extension]]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
index 786ddcd35..2928edb6e 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/coverage.lux
@@ -30,8 +30,8 @@
      ["r" rev]
      ["f" frac]]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1][0]" simple]
     ["[1][0]" complex]
     ["[1][0]" pattern (.only Pattern)]]]])
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux
index 898981049..122b1c563 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/inference.lux
@@ -21,15 +21,15 @@
     [number
      ["n" nat]]]
    [meta
-    ["[0]" symbol "_"
+    ["[0]" symbol
      ["$[1]" \\test]]
-    ["[0]" configuration "_"
+    ["[0]" configuration
      ["$[1]" \\test]]]
    ["[0]" type ("[1]#[0]" equivalence)
     ["[0]" check (.only Check)]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     [evaluation (.only Eval)]
     ["[1][0]" macro]
     ["[1][0]" type]
@@ -38,8 +38,8 @@
     [//
      [phase
       ["[2][0]" analysis]
-      ["[2][0]" extension
-       ["[1]/[0]" analysis "_"
+      ["[2][0]" extension (.only)
+       ["[1]/[0]" analysis
         ["[1]" lux]]]]
      [///
       ["[2][0]" phase ("[1]#[0]" monad)]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux
index 9fdf034cb..ca14e546b 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/macro.lux
@@ -22,16 +22,16 @@
     ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]]]
-   ["[0]" meta
-    ["[0]" configuration "_"
+   ["[0]" meta (.only)
+    ["[0]" configuration
      ["$[1]" \\test]]]]]
- ["$" /////// "_"
+ ["$" ///////
   [macro
    ["[1][0]" code]]
   [meta
    ["[1][0]" symbol]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (def: random_state
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux
index 3f3d66645..18d788d64 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/module.lux
@@ -18,12 +18,12 @@
     ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
-   ["[0]" meta
-    ["[0]" configuration "_"
+   ["[0]" meta (.only)
+    ["[0]" configuration
      ["$[1]" \\test]]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     [//
      [phase
       ["[2][0]" extension]]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux
index 35b685b27..5fc37351c 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/pattern.lux
@@ -15,7 +15,7 @@
      ["f" frac]]]]]
  [\\library
   ["[0]" /]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" simple]
   ["[1][0]" complex]])
 
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/scope.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/scope.lux
index 452ccb5a9..1a98fc073 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/scope.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/scope.lux
@@ -17,11 +17,11 @@
     ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
-   ["[0]" type "_"
+   ["[0]" type
     ["$[1]" \\test]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     [//
      [phase
       ["[1][0]" extension]]
@@ -29,7 +29,7 @@
       ["[1][0]" phase ("[1]#[0]" monad)]
       [reference
        ["[1][0]" variable (.only Register Variable)]]]]]]]
- ["$[0]" // "_"
+ ["$[0]" //
   ["[1][0]" type]])
 
 (template [<name> <tag>]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/type.lux b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/type.lux
index a7f98b655..8446656b2 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/analysis/type.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/analysis/type.lux
@@ -12,13 +12,13 @@
    [math
     ["[0]" random (.only Random)]]
    [meta
-    ["[0]" configuration "_"
+    ["[0]" configuration
      ["$[1]" \\test]]]
    ["[0]" type ("[1]#[0]" equivalence)
     ["[0]" check]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     ["[2][0]" module]
     [//
      [phase
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
index 5a30f2b3a..4ca9f58d7 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis.lux
@@ -21,10 +21,10 @@
    ["[0]" type ("[1]#[0]" equivalence)
     ["[0]" check]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
-    ["[0]" extension
-     ["[1]/[0]" analysis "_"
+    ["[0]" extension (.only)
+     ["[1]/[0]" analysis
       ["[1]" lux]]]
     [//
      ["/[1]" analysis (.only Analysis Operation)
@@ -33,13 +33,13 @@
       ["[1][0]" scope]
       ["[1][0]" module]
       ["[1][0]" pattern]
-      ["[1][0]" type
+      ["[1][0]" type (.only)
        ["$[1]" \\test]]]
      [///
       ["[0]" phase ("[1]#[0]" monad)]
       [meta
        ["[0]" archive]]]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" simple]
   ["[1][0]" complex]
   ["[1][0]" reference]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
index 7bedac9ad..9aa68ea9f 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/case.lux
@@ -9,7 +9,7 @@
     ["[0]" exception]]
    [data
     ["[0]" product]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format]]]
    [macro
     ["[0]" code]]
@@ -18,22 +18,22 @@
    ["[0]" type ("[1]#[0]" equivalence)
     ["[0]" check]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     [//
-     ["[1][0]" extension
-      ["[1]/[0]" analysis "_"
+     ["[1][0]" extension (.only)
+      ["[1]/[0]" analysis
        ["[1]" lux]]]
      [//
-      ["[1][0]" analysis
+      ["[1][0]" analysis (.only)
        [evaluation (.only Eval)]
        ["[2][0]" macro]
        ["[2][0]" scope]
        ["[2][0]" module]
        ["[2][0]" coverage]
-       ["[2][0]" type
+       ["[2][0]" type (.only)
         ["$[1]" \\test]]
-       ["[2][0]" inference "_"
+       ["[2][0]" inference
         ["$[1]" \\test]]]
       [///
        ["[1][0]" phase ("[1]#[0]" monad)]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
index 95d7528d3..9c9ddd153 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
@@ -12,7 +12,7 @@
    [data
     ["[0]" product]
     ["[0]" bit ("[1]#[0]" equivalence)]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" monad monoid)]
@@ -26,18 +26,18 @@
      ["n" nat]
      ["f" frac]]]
    [meta
-    ["[0]" symbol
+    ["[0]" symbol (.only)
      ["$[1]" \\test]]
-    ["[0]" configuration "_"
+    ["[0]" configuration
      ["$[1]" \\test]]]
    ["[0]" type ("[1]#[0]" equivalence)
     ["[0]" check]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     [//
-     ["[1][0]" extension
-      ["[1]/[0]" analysis "_"
+     ["[1][0]" extension (.only)
+      ["[1]/[0]" analysis
        ["[1]" lux]]]
      [//
       ["[1][0]" analysis (.only Analysis)
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
index ad1461f1f..98563f2e6 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/function.lux
@@ -10,7 +10,7 @@
     ["[0]" exception]]
    [data
     ["[0]" product]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format]]
     [collection
      ["[0]" list]]]
@@ -21,26 +21,26 @@
     [number
      ["n" nat]]]
    [meta
-    ["[0]" symbol "_"
+    ["[0]" symbol
      ["$[1]" \\test]]]
    ["[0]" type ("[1]#[0]" equivalence)
     ["$[1]" \\test]
     ["[0]" check]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     [//
-     ["[1][0]" extension
-      ["[1]/[0]" analysis "_"
+     ["[1][0]" extension (.only)
+      ["[1]/[0]" analysis
        ["[1]" lux]]]
      [//
       ["[1][0]" analysis (.only Analysis)
        [evaluation (.only Eval)]
        ["[2][0]" macro]
        ["[2][0]" module]
-       ["[2][0]" type
+       ["[2][0]" type (.only)
         ["$[1]" \\test]]
-       ["[2][0]" inference "_"
+       ["[2][0]" inference
         ["$[1]" \\test]]]
       [///
        ["[1][0]" phase ("[1]#[0]" monad)]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux
index 8cc91640b..171ed5f63 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/reference.lux
@@ -16,15 +16,15 @@
    ["[0]" type ("[1]#[0]" equivalence)
     ["$[1]" \\test]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     [//
      ["[1][0]" extension]
      [//
-      ["[1][0]" analysis
+      ["[1][0]" analysis (.only)
        ["[2][0]" scope]
        ["[2][0]" module]
-       ["[2][0]" type
+       ["[2][0]" type (.only)
         ["$[1]" \\test]]]
       [///
        ["[1][0]" phase ("[1]#[0]" monad)]]]]]]])
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/simple.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/simple.lux
index 7e4b0eb24..b1e0be312 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/simple.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/simple.lux
@@ -13,10 +13,10 @@
    [math
     ["[0]" random]]
    [meta
-    ["[0]" configuration "_"
+    ["[0]" configuration
      ["$[1]" \\test]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [///
     ["[1][0]" extension]
     [//
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension.lux
index 853142226..493c29c2e 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension.lux
@@ -24,7 +24,7 @@
      ["n" nat]
      ["i" int]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [/////
     ["[0]" phase]
     [meta
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index 776c5ad60..7159422cc 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -23,8 +23,8 @@
   [analysis
    ["_[0]" primitive]]]
  [\\
-  ["[0]" /
-   ["///[1]" //// "_"
+  ["[0]" / (.only)
+   ["///[1]" ////
     [analysis
      ["[1][0]" scope]
      ["[1][0]" type]]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis.lux
index 694bd71dc..a9fe9d076 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis.lux
@@ -1,7 +1,7 @@
 (.using
  [lux (.full)
   ["_" test (.only Test)]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" primitive]
   ["[1][0]" structure]
   ["[1][0]" case]
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index ca480307f..dff1134e8 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -9,7 +9,7 @@
    ["[0]" try ("[1]#[0]" functor)]]
   [data
    ["[0]" sum]
-   ["[0]" text
+   ["[0]" text (.only)
     ["%" format (.only format)]]
    [number
     ["n" nat]
@@ -21,19 +21,19 @@
     ["[0]" set]]]
   [math
    ["[0]" random (.only Random)]]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" primitive]]
  [\\
-  ["[0]" /
-   ["/[1]" //
-    ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
+    ["/[1]" //
      [extension
       ["[1][0]" bundle]]
-     ["/[1]" //
+     ["/[1]" // (.only)
       ["[0]" analysis (.only Branch Match Analysis)]
       ["[0]" synthesis (.only Path Synthesis)]
       [///
-       ["[1][0]" reference
+       ["[1][0]" reference (.only)
         [variable (.only Register)]]
        ["[0]" phase]
        [meta
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
index 659aa6663..73ed82d88 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
@@ -7,7 +7,7 @@
    ["[0]" try]]
   [data
    ["[0]" product]
-   ["[0]" text
+   ["[0]" text (.only)
     ["%" format (.only format)]]
    [number
     ["n" nat]]
@@ -19,20 +19,20 @@
    ["^" pattern]]
   [math
    ["[0]" random (.only Random)]]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" primitive]]
  [\\
-  ["[0]" /
-   ["/[1]" //
-    ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
+    ["/[1]" //
      [extension
       ["[1][0]" bundle]]
-     ["/[1]" //
+     ["/[1]" // (.only)
       ["[0]" analysis (.only Analysis)]
       ["[0]" synthesis (.only Synthesis)]
       [///
        [arity (.only Arity)]
-       ["[0]" reference
+       ["[0]" reference (.only)
         ["[0]" variable (.only Variable)]]
        ["[0]" phase]
        [meta
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
index 7bcf38399..fca41d4c5 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
@@ -15,12 +15,12 @@
   [meta
    ["[0]" symbol]]]
  [\\
-  ["[0]" / "_"
-   ["/[1]" //
-    ["/[1]" // "_"
+  ["[0]" /
+   ["/[1]" // (.only)
+    ["/[1]" //
      [extension
       ["[1][0]" bundle]]
-     ["/[1]" //
+     ["/[1]" // (.only)
       ["[1][0]" analysis (.only Analysis)]
       ["[1][0]" synthesis (.only Synthesis)]
       [///
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
index 402847fa0..b98e8d9e0 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
@@ -18,15 +18,15 @@
     ["[0]" list]]]
   [meta
    ["[0]" symbol]]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" primitive]]
  [\\
-  ["[0]" / "_"
-   ["/[1]" //
-    ["/[1]" // "_"
+  ["[0]" /
+   ["/[1]" // (.only)
+    ["/[1]" //
      [extension
       ["[1][0]" bundle]]
-     ["/[1]" //
+     ["/[1]" // (.only)
       ["[1][0]" analysis (.only Analysis)]
       ["[1][0]" synthesis (.only Synthesis)]
       [///
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access.lux b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access.lux
index cc25a9433..175bac435 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/synthesis/access.lux
@@ -2,7 +2,7 @@
  [library
   [lux (.full)
    ["_" test (.only Test)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" side]
   ["[1][0]" member]])
 
diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive.lux b/stdlib/source/test/lux/tool/compiler/meta/archive.lux
index 5bfa782dd..8fe27f4db 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/archive.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/archive.lux
@@ -9,7 +9,7 @@
     ["[0]" exception]]
    [data
     ["[0]" product]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]]
     [collection
      ["[0]" list]
@@ -18,19 +18,16 @@
    [math
     ["[0]" random (.only Random)]
     [number
-     ["n" nat]]]
-   [meta
-    ["[0]" symbol "_"
-     ["$[1]" \\test]]]]]
+     ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["[1][0]" key]
    ["[1][0]" registry]
    ["[1][0]" signature]
-   ["[1][0]" module
+   ["[1][0]" module (.only)
     ["[2][0]" document]
     ["[2][0]" descriptor]]]]
- ["$[0]" / "_"
+ ["$[0]" /
   ["[1][0]" signature]
   ["[1][0]" key]
   ["[1][0]" artifact]
diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/artifact.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/artifact.lux
index 543c776d1..070c08a84 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/archive/artifact.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/archive/artifact.lux
@@ -7,7 +7,7 @@
      ["$[0]" equivalence]]]
    [math
     ["[0]" random (.only Random)]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" category]]
  [\\library
   ["[0]" /]])
diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/key.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/key.lux
index 72819e8eb..4ef34fc1a 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/archive/key.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/archive/key.lux
@@ -8,7 +8,7 @@
     ["[0]" random]]]]
  [\\library
   ["[0]" /]]
- ["[0]" // "_"
+ ["[0]" //
   ["[1][0]" signature]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/module.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/module.lux
index 6d83fe00a..c78d29221 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/archive/module.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/archive/module.lux
@@ -9,13 +9,13 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["[0]" document]
    [//
     ["[0]" key]
-    ["[0]" signature "_"
+    ["[0]" signature
      ["$[1]" \\test]]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" document]
   ["[1][0]" descriptor]])
 
diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/module/document.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/module/document.lux
index e30b4ebde..e6e4ce9f4 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/archive/module/document.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/archive/module/document.lux
@@ -18,11 +18,11 @@
     [number
      ["[0]" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [///
     ["[1][0]" signature ("[1]#[0]" equivalence)]
     ["[1][0]" key]]]]
- ["[0]" /// "_"
+ ["[0]" ///
   ["[1][0]" signature]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux
index 79a21e5a5..91fdad769 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux
@@ -23,10 +23,10 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["[0]" unit]
-    ["[0]" artifact
+    ["[0]" artifact (.only)
      ["[0]" category]]]]])
 
 (template: (tagged? <tag> <it>)
diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/signature.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/signature.lux
index be475616b..00965de69 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/archive/signature.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/archive/signature.lux
@@ -19,7 +19,7 @@
     ["[0]" random (.only Random)]]]]
  [\\library
   ["[0]" /]]
- ["[0]" //// "_"
+ ["[0]" ////
   ["[1][0]" version]])
 
 (def: .public random
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache.lux b/stdlib/source/test/lux/tool/compiler/meta/cache.lux
index 43ff57a06..87ffcb922 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/cache.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/cache.lux
@@ -14,12 +14,12 @@
     ["[0]" file]]]]
  [\\library
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" archive]
   ["[1][0]" module]
   ["[1][0]" artifact]
   ["[1][0]" purge]
-  ["$/[1]" // "_"
+  ["$/[1]" //
    ["[1][0]" context]]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/archive.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/archive.lux
index d0be6166f..953eb2ca0 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/cache/archive.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/cache/archive.lux
@@ -19,19 +19,19 @@
    [world
     ["[0]" file]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
-    ["/[1]" //
-     ["[0]" archive
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
+    ["/[1]" // (.only)
+     ["[0]" archive (.only)
       ["[0]" signature]
       ["[0]" key]
       ["[0]" registry]
-      ["[0]" module
+      ["[0]" module (.only)
        ["[0]" document]]]]]]]
- ["$" // "_"
+ ["$" //
   [//
    ["[1][0]" context]
-   ["[1][0]" archive
+   ["[1][0]" archive (.only)
     ["[2][0]" signature]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/artifact.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/artifact.lux
index 1c466f941..078fbb897 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/cache/artifact.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/cache/artifact.lux
@@ -18,10 +18,10 @@
    [world
     ["[0]" file]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1][0]" module]]]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" context]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux
index 09736b4b9..dce7a527c 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/cache/module.lux
@@ -15,7 +15,7 @@
     ["[0]" file]]]]
  [\\library
   ["[0]" /]]
- ["$[0]" /// "_"
+ ["$[0]" ///
   ["[1][0]" context]])
 
 (`` (implementation: (bad it)
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux b/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux
index b3738d363..6a805eafc 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/cache/purge.lux
@@ -10,7 +10,7 @@
     [concurrency
      ["[0]" async]]]
    [data
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format]]
     ["[0]" binary
      ["$[1]" \\test]]
@@ -25,19 +25,19 @@
    [world
     ["[0]" file]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" //
     ["[1][0]" module]
-    ["[0]" dependency "_"
+    ["[0]" dependency
      ["[1]" module]]
-    ["/[1]" // "_"
-     ["[0]" context
+    ["/[1]" //
+     ["[0]" context (.only)
       ["$[1]" \\test]]
-     ["[0]" archive
+     ["[0]" archive (.only)
       ["[0]" registry]
-      ["[0]" module
+      ["[0]" module (.only)
        ["$[1]" \\test]
-       ["[0]" descriptor
+       ["[0]" descriptor (.only)
         ["$[1]" \\test]]]]
      ["/[1]" //]]]]])
 
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cli.lux b/stdlib/source/test/lux/tool/compiler/meta/cli.lux
index 89ec44c51..a6b7bd78f 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/cli.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/cli.lux
@@ -7,7 +7,7 @@
    [control
     ["[0]" pipe]
     ["[0]" try ("[1]#[0]" functor)]
-    ["<>" parser
+    ["<>" parser (.only)
      ["<[0]>" cli]]]
    [data
     ["[0]" product]
@@ -19,14 +19,12 @@
     [number
      ["n" nat]]]
    [meta
-    ["[0]" symbol "_"
-     ["$[1]" \\test]]
     ["[0]" configuration ("[1]#[0]" equivalence)
      ["$[1]" \\test]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["[1][0]" compiler (.only Compiler)]]]
- ["$[0]" / "_"
+ ["$[0]" /
   ["[1][0]" compiler]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/tool/compiler/meta/cli/compiler.lux b/stdlib/source/test/lux/tool/compiler/meta/cli/compiler.lux
index 5571ed10c..5ae4a3b69 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/cli/compiler.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/cli/compiler.lux
@@ -15,7 +15,7 @@
     [number
      ["n" nat]]]
    [meta
-    ["[0]" symbol "_"
+    ["[0]" symbol
      ["$[1]" \\test]]]]]
  [\\library
   ["[0]" /]])
diff --git a/stdlib/source/test/lux/tool/compiler/meta/export.lux b/stdlib/source/test/lux/tool/compiler/meta/export.lux
index dbc78af58..50430ef8a 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/export.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/export.lux
@@ -30,9 +30,9 @@
    [world
     ["[0]" file]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
-    ["[0]" io "_"
+    ["[0]" io
      ["[1]" context]]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/tool/compiler/meta/import.lux b/stdlib/source/test/lux/tool/compiler/meta/import.lux
index 95366e32e..d18169641 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/import.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/import.lux
@@ -16,7 +16,7 @@
     ["[0]" product]
     ["[0]" binary (.only Binary) ("[1]#[0]" equivalence)]
     ["[0]" bit ("[1]#[0]" equivalence)]
-    ["[0]" format "_"
+    ["[0]" format
      ["[0]" tar (.only Tar)]
      ["[1]" binary]]
     ["[0]" text ("[1]#[0]" equivalence)
@@ -33,10 +33,10 @@
    [world
     ["[0]" file]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     ["[0]" export]
-    ["[0]" io "_"
+    ["[0]" io
      ["[1]" context]]]]])
 
 (def: .public test
diff --git a/stdlib/source/test/lux/tool/compiler/phase.lux b/stdlib/source/test/lux/tool/compiler/phase.lux
index 7acf50e5b..10c7cc88f 100644
--- a/stdlib/source/test/lux/tool/compiler/phase.lux
+++ b/stdlib/source/test/lux/tool/compiler/phase.lux
@@ -20,7 +20,7 @@
      ["n" nat]
      ["i" int]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     [meta
      ["[0]" archive]]]]])
diff --git a/stdlib/source/test/lux/tool/compiler/reference.lux b/stdlib/source/test/lux/tool/compiler/reference.lux
index ae10eba30..eb464ccf1 100644
--- a/stdlib/source/test/lux/tool/compiler/reference.lux
+++ b/stdlib/source/test/lux/tool/compiler/reference.lux
@@ -17,9 +17,9 @@
    [meta
     ["[0]" symbol ("[1]#[0]" equivalence)]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["[0]" variable (.only Register)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" variable]])
 
 (def: constant
diff --git a/stdlib/source/test/lux/type.lux b/stdlib/source/test/lux/type.lux
index e10ea267f..0c6d1e6fa 100644
--- a/stdlib/source/test/lux/type.lux
+++ b/stdlib/source/test/lux/type.lux
@@ -24,7 +24,7 @@
      ["n" nat]]]]]
  [\\library
   ["[0]" / ("[1]#[0]" equivalence)]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" primitive]
   ["[1][0]" check]
   ["[1][0]" dynamic]
diff --git a/stdlib/source/test/lux/type/dynamic.lux b/stdlib/source/test/lux/type/dynamic.lux
index ee3d7583f..3b9179d37 100644
--- a/stdlib/source/test/lux/type/dynamic.lux
+++ b/stdlib/source/test/lux/type/dynamic.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]]
diff --git a/stdlib/source/test/lux/type/implicit.lux b/stdlib/source/test/lux/type/implicit.lux
index c2a299715..4eb575a18 100644
--- a/stdlib/source/test/lux/type/implicit.lux
+++ b/stdlib/source/test/lux/type/implicit.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [equivalence (.only)]
diff --git a/stdlib/source/test/lux/type/poly.lux b/stdlib/source/test/lux/type/poly.lux
index 1f91b2eef..10c3bbbf6 100644
--- a/stdlib/source/test/lux/type/poly.lux
+++ b/stdlib/source/test/lux/type/poly.lux
@@ -1,10 +1,10 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]]]
  [\\library
   ["[0]" /]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" equivalence]
   ["[1][0]" functor]
   ["[1][0]" json]])
diff --git a/stdlib/source/test/lux/type/poly/functor.lux b/stdlib/source/test/lux/type/poly/functor.lux
index e602c6398..35daa7eff 100644
--- a/stdlib/source/test/lux/type/poly/functor.lux
+++ b/stdlib/source/test/lux/type/poly/functor.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["@" target]
    [abstract
     [monad (.only do)]
diff --git a/stdlib/source/test/lux/type/poly/json.lux b/stdlib/source/test/lux/type/poly/json.lux
index 7e749a96e..9ecd3684c 100644
--- a/stdlib/source/test/lux/type/poly/json.lux
+++ b/stdlib/source/test/lux/type/poly/json.lux
@@ -5,7 +5,7 @@
    ["@" target]
    ["[0]" debug]
    [abstract
-    [codec (.full)]
+    [codec (.except)]
     [monad (.only do)]
     ["[0]" equivalence (.only Equivalence)
      ["poly/[1]" \\poly]]
diff --git a/stdlib/source/test/lux/type/primitive.lux b/stdlib/source/test/lux/type/primitive.lux
index 922d4c094..bb6defdda 100644
--- a/stdlib/source/test/lux/type/primitive.lux
+++ b/stdlib/source/test/lux/type/primitive.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    ["[0]" meta]
    [abstract
@@ -12,11 +12,11 @@
      ["<[0]>" code]]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]
     ["[0]" template]]
-   ["[0]" math
+   ["[0]" math (.only)
     ["[0]" random]
     [number
      ["n" nat]]]]]
diff --git a/stdlib/source/test/lux/type/quotient.lux b/stdlib/source/test/lux/type/quotient.lux
index 1e2e2586e..a0f2fa444 100644
--- a/stdlib/source/test/lux/type/quotient.lux
+++ b/stdlib/source/test/lux/type/quotient.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     ["[0]" monad (.only do)]
diff --git a/stdlib/source/test/lux/type/refinement.lux b/stdlib/source/test/lux/type/refinement.lux
index 3b62d786a..fbf318736 100644
--- a/stdlib/source/test/lux/type/refinement.lux
+++ b/stdlib/source/test/lux/type/refinement.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [predicate (.only Predicate)]
diff --git a/stdlib/source/test/lux/type/resource.lux b/stdlib/source/test/lux/type/resource.lux
index c04c15202..f49981fdd 100644
--- a/stdlib/source/test/lux/type/resource.lux
+++ b/stdlib/source/test/lux/type/resource.lux
@@ -1,10 +1,10 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    ["[0]" meta]
    [abstract
-    ["[0]" monad
+    ["[0]" monad (.only)
      [indexed (.only do)]]]
    [control
     ["[0]" io (.only IO)]
@@ -18,7 +18,7 @@
     ["[0]" identity (.only Identity)]
     ["[0]" text ("[1]#[0]" equivalence)
      ["%" format (.only format)]]]
-   ["[0]" macro
+   ["[0]" macro (.only)
     [syntax (.only syntax:)]
     ["[0]" code]]
    [math
diff --git a/stdlib/source/test/lux/type/unit.lux b/stdlib/source/test/lux/type/unit.lux
index 9ea3cc3bf..19b2bc9c2 100644
--- a/stdlib/source/test/lux/type/unit.lux
+++ b/stdlib/source/test/lux/type/unit.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    ["[0]" debug]
    ["[0]" meta]
diff --git a/stdlib/source/test/lux/type/variance.lux b/stdlib/source/test/lux/type/variance.lux
index d73853e99..c9e65123e 100644
--- a/stdlib/source/test/lux/type/variance.lux
+++ b/stdlib/source/test/lux/type/variance.lux
@@ -1,14 +1,14 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]]
    [math
     ["[0]" random (.only Random)]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" // "_"
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     ["[1][0]" check]]]])
 
 (type: Super
diff --git a/stdlib/source/test/lux/world.lux b/stdlib/source/test/lux/world.lux
index 6dee850f2..bebd06ea8 100644
--- a/stdlib/source/test/lux/world.lux
+++ b/stdlib/source/test/lux/world.lux
@@ -1,19 +1,19 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" file]
   ["[1][0]" shell]
   ["[1][0]" console]
   ["[1][0]" program]
-  ["[1][0]" input "_"
+  ["[1][0]" input
    ["[1]/[0]" keyboard]]
-  ["[1][0]" output "_"
-   ["[1]/[0]" video "_"
+  ["[1][0]" output
+   ["[1]/[0]" video
     ["[1]/[0]" resolution]]]
-  ["[1][0]" net "_"
-   ["[1]/[0]" http "_"
+  ["[1][0]" net
+   ["[1]/[0]" http
     ["[1]/[0]" client]
     ["[1]/[0]" status]]]])
 
diff --git a/stdlib/source/test/lux/world/console.lux b/stdlib/source/test/lux/world/console.lux
index c82991687..9cfe5dbc5 100644
--- a/stdlib/source/test/lux/world/console.lux
+++ b/stdlib/source/test/lux/world/console.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]]
diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index 9954bc4d4..53c2c7ce9 100644
--- a/stdlib/source/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     ["[0]" monad (.only do)]]
@@ -23,7 +23,7 @@
     ["[0]" random]]
    [time
     ["[0]" instant (.only Instant)]]]]
- ["[0]" / "_"
+ ["[0]" /
   ["[1][0]" watch]]
  [\\library
   ["[0]" /]]
diff --git a/stdlib/source/test/lux/world/file/watch.lux b/stdlib/source/test/lux/world/file/watch.lux
index b87d5186e..af69350e0 100644
--- a/stdlib/source/test/lux/world/file/watch.lux
+++ b/stdlib/source/test/lux/world/file/watch.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [predicate (.only Predicate)]
@@ -19,7 +19,7 @@
    [math
     ["[0]" random (.only Random) ("[1]#[0]" monad)]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]]
  [////
   [data
diff --git a/stdlib/source/test/lux/world/input/keyboard.lux b/stdlib/source/test/lux/world/input/keyboard.lux
index 8ae8e68ed..f13e615a0 100644
--- a/stdlib/source/test/lux/world/input/keyboard.lux
+++ b/stdlib/source/test/lux/world/input/keyboard.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]]
diff --git a/stdlib/source/test/lux/world/net/http/client.lux b/stdlib/source/test/lux/world/net/http/client.lux
index 00ef6f8ec..21cbaa354 100644
--- a/stdlib/source/test/lux/world/net/http/client.lux
+++ b/stdlib/source/test/lux/world/net/http/client.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [monad (.only Monad do)]]
@@ -14,7 +14,7 @@
    [data
     ["[0]" binary]
     ["[0]" product]
-    ["[0]" text
+    ["[0]" text (.only)
      ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
@@ -25,8 +25,8 @@
     [number
      ["[0]" nat]]]]]
  [\\library
-  ["[0]" /
-   ["/[1]" //
+  ["[0]" / (.only)
+   ["/[1]" // (.only)
     ["[1][0]" status]]]])
 
 (def: (verification ! expected response)
diff --git a/stdlib/source/test/lux/world/net/http/status.lux b/stdlib/source/test/lux/world/net/http/status.lux
index 4e7c3cef2..fe1a74690 100644
--- a/stdlib/source/test/lux/world/net/http/status.lux
+++ b/stdlib/source/test/lux/world/net/http/status.lux
@@ -12,7 +12,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    ["/[1]" //]]])
 
 (with_expansions [<categories> (these [informational
diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux
index cdd2797a0..347162ff5 100644
--- a/stdlib/source/test/lux/world/output/video/resolution.lux
+++ b/stdlib/source/test/lux/world/output/video/resolution.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]
diff --git a/stdlib/source/test/lux/world/program.lux b/stdlib/source/test/lux/world/program.lux
index 6501a1074..3d7119229 100644
--- a/stdlib/source/test/lux/world/program.lux
+++ b/stdlib/source/test/lux/world/program.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]]
@@ -22,7 +22,7 @@
     [number
      ["n" nat]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     [file (.only Path)]]]]
  [\\specification
diff --git a/stdlib/source/test/lux/world/shell.lux b/stdlib/source/test/lux/world/shell.lux
index 59c0eccb6..c9960e037 100644
--- a/stdlib/source/test/lux/world/shell.lux
+++ b/stdlib/source/test/lux/world/shell.lux
@@ -1,6 +1,6 @@
 (.using
  [library
-  [lux (.full)
+  [lux (.except)
    ["_" test (.only Test)]
    [abstract
     [monad (.only do)]]
@@ -22,7 +22,7 @@
      ["n" nat]
      ["i" int]]]]]
  [\\library
-  ["[0]" /
+  ["[0]" / (.only)
    [//
     [file (.only Path)]]]]
  [\\specification