Extensible import syntax: Part 1

46 files changed, 225 insertions, 225 deletions

diff --git a/stdlib/source/test/aedifex/artifact.lux b/stdlib/source/test/aedifex/artifact.lux
index 150724ade..7cbf804c5 100644
--- a/stdlib/source/test/aedifex/artifact.lux
+++ b/stdlib/source/test/aedifex/artifact.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
-    [hash {"+" Hash}]
+    [monad (.only do)]
+    [hash (.only Hash)]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" order]
@@ -12,7 +12,7 @@
    [data
     ["[0]" text ("[1]#[0]" equivalence)]]
    [math
-    ["[0]" random {"+" Random}]]
+    ["[0]" random (.only Random)]]
    [world
     ["[0]" file]
     [net
diff --git a/stdlib/source/test/aedifex/artifact/extension.lux b/stdlib/source/test/aedifex/artifact/extension.lux
index ab6bc4949..b9184c15a 100644
--- a/stdlib/source/test/aedifex/artifact/extension.lux
+++ b/stdlib/source/test/aedifex/artifact/extension.lux
@@ -1,16 +1,16 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)]
     [collection
      ["[0]" set]
      ["[0]" list]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
  [\\program
diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index e44ba514c..b09095646 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" xml]]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]]]]
  ["$[0]" / "_"
   ["[1][0]" build]
   ["[1][0]" stamp]
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index 36267e060..8a722c72a 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" xml]]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]])
 
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index 25134c0cb..54aa5d8af 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" xml]]]
    [math
-    ["[0]" random {"+" Random}]]
+    ["[0]" random (.only Random)]]
    [time
     ["[0]" instant]]]]
  [\\program
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index cde73c729..1e40d43d7 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" text]]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]]
  ["$[0]" /// "_"
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 53e45aa9e..951e78380 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" xml]]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]]
  ["[0]" / "_"
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index 81df110ce..511abf693 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -12,9 +12,9 @@
      ["<[0]>" text]]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]
      ["i" int]]]
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index 521b07e9e..e3e853a86 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -13,7 +13,7 @@
    [time
     ["[0]" instant ("[1]#[0]" equivalence)]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["i" int]]]]]
  [\\program
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index 48e4188a4..1180f66b2 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -12,7 +12,7 @@
     [parser
      ["<[0]>" text]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]
      ["i" int]]]
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index 70fc9dddf..b666871fd 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -1,16 +1,16 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    ["[0]" time]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try ("[1]#[0]" functor)]
     [parser
      ["<[0]>" text]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]
      ["i" int]]]]]
diff --git a/stdlib/source/test/aedifex/artifact/type.lux b/stdlib/source/test/aedifex/artifact/type.lux
index 4166828f8..631538bc4 100644
--- a/stdlib/source/test/aedifex/artifact/type.lux
+++ b/stdlib/source/test/aedifex/artifact/type.lux
@@ -1,16 +1,16 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [data
     ["[0]" text]
     [collection
      ["[0]" set]
      ["[0]" list]]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]]]]]
  [\\program
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index 683468bcf..3a05977e2 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -11,7 +11,7 @@
     [parser
      ["<[0]>" xml]]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]]
  ["$[0]" // "_"
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 690ff01ff..8b2843709 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -1,25 +1,25 @@
 (.using
  [library
   [lux {"-" Type type}
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    ["[0]" monad {"+" do}]]
+    ["[0]" monad (.only do)]]
    [control
     ["[0]" try]
     [concurrency
-     ["[0]" async {"+" Async}]]
+     ["[0]" async (.only Async)]]
     [parser
      ["[0]" environment]]]
    [data
-    [binary {"+" Binary}]
+    [binary (.only Binary)]
     ["[0]" text]
     [format
-     [xml {"+" XML}]]
+     [xml (.only XML)]]
     [collection
      ["[0]" set]
      ["[0]" dictionary]]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]]]
    [world
@@ -35,13 +35,13 @@
  [\\program
   ["[0]" /
    ["/[1]" // "_"
-    ["[1]" profile {"+" Profile}]
-    ["[1][0]" package {"+" Package}]
+    ["[1]" profile (.only Profile)]
+    ["[1][0]" package (.only Package)]
     ["[1][0]" pom]
-    ["[1][0]" dependency {"+" Dependency}
-     ["[1]/[0]" resolution {"+" Resolution}]]
-    ["[1][0]" artifact {"+" Artifact}
-     ["[1]/[0]" type {"+" Type}]]
+    ["[1][0]" dependency (.only Dependency)
+     ["[1]/[0]" resolution (.only Resolution)]]
+    ["[1][0]" artifact (.only Artifact)
+     ["[1]/[0]" type (.only Type)]]
     ["[1][0]" repository "_"
      ["[1]/[0]" origin]]]]])
 
diff --git a/stdlib/source/test/aedifex/cli.lux b/stdlib/source/test/aedifex/cli.lux
index 4f4de026a..adaf85064 100644
--- a/stdlib/source/test/aedifex/cli.lux
+++ b/stdlib/source/test/aedifex/cli.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -16,7 +16,7 @@
     [collection
      ["[0]" list]]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]]]]
  [\\program
   ["[0]" /
    ["/[1]" // "_"
diff --git a/stdlib/source/test/aedifex/command.lux b/stdlib/source/test/aedifex/command.lux
index 496e1cd78..3dd0a2dc5 100644
--- a/stdlib/source/test/aedifex/command.lux
+++ b/stdlib/source/test/aedifex/command.lux
@@ -1,7 +1,7 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]]]
+   ["_" test (.only Test)]]]
  ["[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 7a1e7dc35..b014162ea 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -1,21 +1,21 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" pipe]
     ["[0]" try]
     [parser
      ["[0]" environment]]
     [concurrency
-     ["[0]" atom {"+" Atom}]
-     ["[0]" async {"+" Async}]]]
+     ["[0]" atom (.only Atom)]
+     ["[0]" async (.only Async)]]]
    [data
     ["[0]" binary]
     ["[0]" text
-     ["%" format {"+" format}]
+     ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
     [collection
@@ -27,9 +27,9 @@
    [time
     ["[0]" instant]]
    [world
-    [console {"+" Console}]
-    ["[0]" shell {"+" Exit Shell}]
-    ["[0]" program {"+" Program}]
+    [console (.only Console)]
+    ["[0]" shell (.only Exit Shell)]
+    ["[0]" program (.only Program)]
     ["[0]" file
      ["[0]" watch]]]]]
  ["[0]" // "_"
@@ -38,11 +38,11 @@
  [\\program
   ["[0]" /
    ["//[1]" /// "_"
-    [command {"+" Command}]
-    ["[1]" profile {"+" Profile}]
+    [command (.only Command)]
+    ["[1]" profile (.only Profile)]
     ["[1][0]" action]
     [dependency
-     [resolution {"+" Resolution}]]]]])
+     [resolution (.only Resolution)]]]]])
 
 (def: (command expected_runs end_signal fs dummy_file)
   (-> Nat Text (file.System Async) file.Path
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index 4d813a8ad..ac25c782f 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -1,16 +1,16 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
-    [io {"+" IO}]
+    [io (.only IO)]
     ["[0]" pipe]
     ["[0]" try]
     ["[0]" exception]
     [concurrency
-     ["[0]" async {"+" Async}]]
+     ["[0]" async (.only Async)]]
     [parser
      ["[0]" environment]]]
    [data
@@ -18,10 +18,10 @@
     [collection
      ["[0]" dictionary]]]
    [math
-    ["[0]" random {"+" Random}]]
+    ["[0]" random (.only Random)]]
    [world
     ["[0]" file]
-    ["[0]" shell {"+" Shell}]
+    ["[0]" shell (.only Shell)]
     ["[0]" program]]]]
  ["[0]" // "_"
   ["@[0]" version]
@@ -30,12 +30,12 @@
  [\\program
   ["[0]" /
    ["//[1]" /// "_"
-    ["[1]" profile {"+" Profile}]
+    ["[1]" profile (.only Profile)]
     ["[1][0]" action]
     ["[1][0]" artifact
      ["[1]/[0]" type]]
-    ["[1][0]" dependency {"+" Dependency}
-     ["[1]/[0]" resolution {"+" Resolution}]]]]])
+    ["[1][0]" dependency (.only Dependency)
+     ["[1]/[0]" resolution (.only Resolution)]]]]])
 
 (def: .public good_shell
   (-> Any (Shell IO))
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index 90dd9c8b9..12c563343 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -1,27 +1,27 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    ["[0]" monad {"+" do}]]
+    ["[0]" monad (.only do)]]
    [control
-    ["[0]" try {"+" Try}]
+    ["[0]" try (.only Try)]
     [concurrency
-     ["[0]" async {"+" Async}]]]
+     ["[0]" async (.only Async)]]]
    [data
-    [binary {"+" Binary}]
+    [binary (.only Binary)]
     ["[0]" product]
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
      ["[0]" list ("[1]#[0]" functor)]
      ["[0]" set]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    [world
-    ["[0]" file {"+" Path}]]]]
+    ["[0]" file (.only Path)]]]]
  [//
   ["@[0]" version]
   [//
@@ -34,7 +34,7 @@
   ["[0]" /
    ["//[1]" /// "_"
     ["[1]" profile]
-    ["[1][0]" action {"+" Action}]]]])
+    ["[1][0]" action (.only Action)]]]])
 
 (def: node_name
   (Random Text)
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index 67e1bf702..a1d55a274 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -1,20 +1,20 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" maybe]
-    ["[0]" try {"+" Try}]
+    ["[0]" try (.only Try)]
     [concurrency
-     ["[0]" async {"+" Async}]]
+     ["[0]" async (.only Async)]]
     [parser
      ["[0]" environment]]]
    [data
     ["[0]" binary ("[1]#[0]" equivalence)]
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]
+     ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
     ["[0]" format "_"
@@ -31,7 +31,7 @@
       ["[0]" export]]]]
    [world
     ["[0]" file]
-    ["[0]" program {"+" Program}]
+    ["[0]" program (.only Program)]
     ["[0]" shell]]]]
  [//
   ["$[0]" build]
@@ -47,10 +47,10 @@
     ["[1][0]" action]
     ["[1][0]" pom]
     ["[1][0]" hash]
-    ["[1][0]" repository {"+" Repository}
+    ["[1][0]" repository (.only Repository)
      ["[1]/[0]" local]
      ["[1]/[0]" remote]]
-    ["[1][0]" artifact {"+" Artifact}
+    ["[1][0]" artifact (.only Artifact)
      ["[1]/[0]" extension]]]]])
 
 (def: (execute! program local remote fs artifact profile)
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index aeffb80f5..f4a30323e 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     ["[0]" predicate]]
    [control
     ["[0]" try]
@@ -13,7 +13,7 @@
      ["[0]" environment]]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]
+     ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
     [collection
@@ -22,7 +22,7 @@
     [format
      ["[0]" xml]]]
    [math
-    ["[0]" random {"+" Random}]]
+    ["[0]" random (.only Random)]]
    [world
     ["[0]" program]
     ["[0]" file]]]]
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index e0392fd56..e60f7d06c 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -1,27 +1,27 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    ["[0]" monad {"+" do}]]
+    ["[0]" monad (.only do)]]
    [control
-    ["[0]" try {"+" Try} ("[1]#[0]" functor)]
+    ["[0]" try (.only Try) ("[1]#[0]" functor)]
     ["[0]" exception]
     [concurrency
-     ["[0]" async {"+" Async}]]
+     ["[0]" async (.only Async)]]
     [parser
      ["[0]" environment]]]
    [data
     ["[0]" binary]
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
-     ["[0]" set {"+" Set}]]]
+     ["[0]" set (.only Set)]]]
    [math
     ["[0]" random]]
    [world
     ["[0]" file]
-    ["[0]" program {"+" Program}]]]]
+    ["[0]" program (.only Program)]]]]
  [//
   ["$[0]" version]
   [//
@@ -32,7 +32,7 @@
    ["/[1]" // "_"
     ["/[1]" // "_"
      ["[1]" profile]
-     ["[1][0]" action {"+" Action}]
+     ["[1][0]" action (.only Action)]
      ["[1][0]" local]
      ["[1][0]" artifact
       ["[1]/[0]" extension]]
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 54312e388..84e225678 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try ("[1]#[0]" functor)]
     [concurrency
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index eec957702..520609c43 100644
--- a/stdlib/source/test/aedifex/command/test.lux
+++ b/stdlib/source/test/aedifex/command/test.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try]
     ["[0]" exception]
@@ -32,7 +32,7 @@
    ["/[1]" // "_"
     ["[1][0]" build]
     ["/[1]" // "_"
-     ["[1]" profile {"+" Profile}]
+     ["[1]" profile (.only Profile)]
      ["[1][0]" action]
      ["[1][0]" artifact
       ["[1]/[0]" type]]
diff --git a/stdlib/source/test/aedifex/command/version.lux b/stdlib/source/test/aedifex/command/version.lux
index 5a0fbf681..b8792434a 100644
--- a/stdlib/source/test/aedifex/command/version.lux
+++ b/stdlib/source/test/aedifex/command/version.lux
@@ -1,18 +1,18 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" maybe]
     ["[0]" try]
-    ["[0]" exception {"+" exception:}]
+    ["[0]" exception (.only exception:)]
     [concurrency
-     ["[0]" async {"+" Async}]]]
+     ["[0]" async (.only Async)]]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [math
     ["[0]" random]]
    [meta
@@ -21,7 +21,7 @@
     [compiler
      ["[0]" version]]]
    [world
-    ["[0]" console {"+" Console Mock}]]]]
+    ["[0]" console (.only Console Mock)]]]]
  [///
   ["@[0]" profile]]
  [\\program
diff --git a/stdlib/source/test/aedifex/dependency.lux b/stdlib/source/test/aedifex/dependency.lux
index bdc26bd7b..01fb3f6dc 100644
--- a/stdlib/source/test/aedifex/dependency.lux
+++ b/stdlib/source/test/aedifex/dependency.lux
@@ -1,15 +1,15 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" order]
      ["$[0]" hash]]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  [//
   ["@[0]" artifact]]
  [\\program
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index f9f5e6763..d647ad815 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -1,33 +1,33 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
-    ["[0]" hash {"+" Hash}]]
+    [monad (.only do)]
+    ["[0]" hash (.only Hash)]]
    [control
-    ["[0]" io {"+" IO}]
+    ["[0]" io (.only IO)]
     ["[0]" maybe ("[1]#[0]" functor)]
     ["[0]" try ("[1]#[0]" functor)]
     [concurrency
-     ["[0]" atom {"+" Atom}]
+     ["[0]" atom (.only Atom)]
      ["[0]" async]]]
    [data
     ["[0]" product]
-    ["[0]" binary {"+" Binary} ("[1]#[0]" equivalence)]
+    ["[0]" binary (.only Binary) ("[1]#[0]" equivalence)]
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
-     ["[0]" dictionary {"+" Dictionary}]
+     ["[0]" dictionary (.only Dictionary)]
      ["[0]" set]
      ["[0]" list ("[1]#[0]" mix)]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    [world
-    [net {"+" URL}
-     ["[0]" uri {"+" URI}]
+    [net (.only URL)
+     ["[0]" uri (.only URI)]
      ["[0]" http "_"
       ["[1]" client]
       ["[1]/[0]" status]
@@ -37,13 +37,13 @@
    ["[1][0]" package]]]
  [\\program
   ["[0]" /
-   [// {"+" Dependency}
+   [// (.only Dependency)
     ["[0]" resolution]
     [//
      ["[0]" profile]
      ["[0]" metadata]
-     ["[0]" package {"+" Package}]
-     ["[0]" artifact {"+" Artifact} ("[1]#[0]" equivalence)
+     ["[0]" package (.only Package)]
+     ["[0]" artifact (.only Artifact) ("[1]#[0]" equivalence)
       ["[1]/[0]" type]
       ["[1]/[0]" extension]]
      ["[0]" repository
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index e5db7fe3c..2455043f4 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux {"-" all}
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     ["[0]" predicate]
     [\\specification
      ["$[0]" equivalence]]]
@@ -13,10 +13,10 @@
     [concurrency
      ["[0]" async]]]
    [data
-    [binary {"+" Binary}]
+    [binary (.only Binary)]
     ["[0]" product]
     ["[0]" text
-     ["%" format {"+" format}]
+     ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
     [format
@@ -26,7 +26,7 @@
      ["[0]" set]
      ["[0]" list]]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  ["$[0]" /// "_"
   ["[1][0]" package]
   ["[1][0]" repository]
@@ -37,15 +37,15 @@
   ["[0]" /
    ["//[1]" /// "_"
     ["[1]" profile]
-    ["[1][0]" package {"+" Package}]
+    ["[1][0]" package (.only Package)]
     ["[1][0]" hash]
-    ["[1][0]" dependency {"+" Dependency} ("[1]#[0]" equivalence)
+    ["[1][0]" dependency (.only Dependency) ("[1]#[0]" equivalence)
      ["[1]/[0]" status]]
     ["[1][0]" pom]
-    ["[1][0]" artifact {"+" Artifact}
+    ["[1][0]" artifact (.only Artifact)
      ["[1]/[0]" type]
      ["[1]/[0]" extension]]
-    ["[1][0]" repository {"+" Mock}
+    ["[1][0]" repository (.only Mock)
      ["[1]/[0]" origin]]]]])
 
 (def: random
diff --git a/stdlib/source/test/aedifex/dependency/status.lux b/stdlib/source/test/aedifex/dependency/status.lux
index 5f221b4e4..f41c64825 100644
--- a/stdlib/source/test/aedifex/dependency/status.lux
+++ b/stdlib/source/test/aedifex/dependency/status.lux
@@ -1,16 +1,16 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [data
     ["[0]" binary "_"
      ["[1]T" \\test]]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]]]]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]]]]
  ["$[0]" /// "_"
   ["[1][0]" hash]]
  [\\program
diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux
index 339c7c3b4..880d721b3 100644
--- a/stdlib/source/test/aedifex/hash.lux
+++ b/stdlib/source/test/aedifex/hash.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" codec]]]
@@ -11,11 +11,11 @@
     ["[0]" try]
     ["[0]" exception]]
    [data
-    ["[0]" binary {"+" Binary}]
+    ["[0]" binary (.only Binary)]
     [text
-     ["%" format {"+" format}]]]
+     ["%" format (.only format)]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]]]
  [\\program
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index 5cc687a7b..87d9daa51 100644
--- a/stdlib/source/test/aedifex/input.lux
+++ b/stdlib/source/test/aedifex/input.lux
@@ -1,20 +1,20 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
-    ["[0]" try {"+" Try}]
+    ["[0]" try (.only Try)]
     [concurrency
-     ["[0]" async {"+" Async}]]]
+     ["[0]" async (.only Async)]]]
    [data
     [text
      ["%" format]
      [encoding
       ["[0]" utf8]]]
     [collection
-     ["[0]" set {"+" Set}]]]
+     ["[0]" set (.only Set)]]]
    [math
     ["[0]" random]]
    [world
@@ -24,12 +24,12 @@
  [\\program
   ["[0]" /
    ["/[1]" // "_"
-    ["[1]" profile {"+" Profile}]
+    ["[1]" profile (.only Profile)]
     ["[1][0]" project]
     ["[1][0]" action]
     ["[1][0]" format]
     [repository
-     [remote {"+" Address}]]]]])
+     [remote (.only Address)]]]]])
 
 (def: (with_default_source sources)
   (-> (Set //.Source) (Set //.Source))
diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux
index 58f1c019e..effbbfffb 100644
--- a/stdlib/source/test/aedifex/local.lux
+++ b/stdlib/source/test/aedifex/local.lux
@@ -1,13 +1,13 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [data
     ["[0]" text]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  [//
   ["@[0]" artifact]]
  [\\program
diff --git a/stdlib/source/test/aedifex/metadata.lux b/stdlib/source/test/aedifex/metadata.lux
index 20c67f929..d4919de21 100644
--- a/stdlib/source/test/aedifex/metadata.lux
+++ b/stdlib/source/test/aedifex/metadata.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [data
     ["[0]" text ("[1]#[0]" equivalence)]]
    [math
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 02f1a6611..ed3690608 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -21,7 +21,7 @@
    [macro
     ["[0]" code]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    ["[0]" time
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 27cffb1f0..3c4bb2395 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -21,14 +21,14 @@
    [macro
     ["[0]" code]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]]]
    ["[0]" time
     ["[0]" date]
     ["[0]" year]
     ["[0]" month]
-    ["[0]" instant {"+" Instant}]
+    ["[0]" instant (.only Instant)]
     ["[0]" duration]]
    [world
     ["[0]" file]
@@ -44,7 +44,7 @@
    ["/[1]" //
     ["/[1]" // "_"
      [artifact
-      [versioning {"+" Versioning}]
+      [versioning (.only Versioning)]
       ["[1][0]" snapshot]]
      ["[1][0]" repository "_"
       ["[1]/[0]" local]]]]]])
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 4b95cd250..84e3005c5 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -14,11 +14,11 @@
      [encoding
       ["[0]" utf8]]]
     [format
-     ["[0]" xml {"+" XML}]]
+     ["[0]" xml (.only XML)]]
     [collection
-     ["[0]" set {"+" Set}]]]
+     ["[0]" set (.only Set)]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    [world
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index c63d1701c..038037372 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
-    [hash {"+" Hash}]]
+    [monad (.only do)]
+    [hash (.only Hash)]]
    [control
     ["[0]" pipe]
     ["[0]" try]
@@ -13,11 +13,11 @@
    [data
     ["[0]" text]
     [collection
-     ["[0]" set {"+" Set}]
-     ["[0]" dictionary {"+" Dictionary}]
+     ["[0]" set (.only Set)]
+     ["[0]" dictionary (.only Dictionary)]
      ["[0]" list ("[1]#[0]" functor)]]]
    [math
-    ["[0]" random {"+" Random}]
+    ["[0]" random (.only Random)]
     [number
      ["n" nat]]]
    [macro
@@ -28,9 +28,9 @@
   ["[0]" /
    ["/[1]" // "_"
     ["[1]" profile]
-    ["[1][0]" project {"+" Project}]
-    ["[1][0]" artifact {"+" Artifact}]
-    ["[1][0]" dependency {"+" Dependency}]
+    ["[1][0]" project (.only Project)]
+    ["[1][0]" artifact (.only Artifact)]
+    ["[1][0]" dependency (.only Dependency)]
     ["[1][0]" format]]]])
 
 (def: name
diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux
index ac8869c54..edaeca6cc 100644
--- a/stdlib/source/test/aedifex/pom.lux
+++ b/stdlib/source/test/aedifex/pom.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try]
     ["[0]" exception]
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 8bccf4459..7dd2981bf 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -1,10 +1,10 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
-    [hash {"+" Hash}]
+    [monad (.only do)]
+    [hash (.only Hash)]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" monoid]]]
@@ -15,10 +15,10 @@
    [data
     ["[0]" text ("[1]#[0]" equivalence)]
     [collection
-     ["[0]" set {"+" Set}]
-     ["[0]" dictionary {"+" Dictionary}]]]
+     ["[0]" set (.only Set)]
+     ["[0]" dictionary (.only Dictionary)]]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]]]
    [tool
@@ -34,10 +34,10 @@
   ["[0]" /
    ["/[1]" // "_"
     ["[1][0]" runtime]
-    ["[1][0]" dependency {"+" Dependency}]
+    ["[1][0]" dependency (.only Dependency)]
     ["[1][0]" format]
     [repository
-     [remote {"+" Address}]]]]])
+     [remote (.only Address)]]]]])
 
 (def: distribution
   (Random /.Distribution)
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index 748ea922d..68e3c0e6d 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]
      ["$[0]" monoid]]]
@@ -14,7 +14,7 @@
     ["[0]" product]
     ["[0]" text ("[1]#[0]" equivalence)]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]]]]]
  [//
diff --git a/stdlib/source/test/aedifex/repository.lux b/stdlib/source/test/aedifex/repository.lux
index 80d3f43e9..465d46709 100644
--- a/stdlib/source/test/aedifex/repository.lux
+++ b/stdlib/source/test/aedifex/repository.lux
@@ -1,27 +1,27 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [equivalence {"+" Equivalence}]
-    [hash {"+" Hash}]
-    ["[0]" monad {"+" do}]]
+    [equivalence (.only Equivalence)]
+    [hash (.only Hash)]
+    ["[0]" monad (.only do)]]
    [control
     ["[0]" io]
     ["[0]" try]
-    ["[0]" exception {"+" exception:}]]
+    ["[0]" exception (.only exception:)]]
    [data
     ["[0]" product]
-    ["[0]" binary {"+" Binary}]
+    ["[0]" binary (.only Binary)]
     ["[0]" text
-     ["%" format {"+" format}]]
+     ["%" format (.only format)]]
     [collection
-     ["[0]" dictionary {"+" Dictionary}]]]
+     ["[0]" dictionary (.only Dictionary)]]]
    [math
-    ["[0]" random {"+" Random}]]
+    ["[0]" random (.only Random)]]
    [world
     [net
-     ["[0]" uri {"+" URI}]]]]]
+     ["[0]" uri (.only URI)]]]]]
  ["[0]" / "_"
   ["[1][0]" identity]
   ["[1][0]" origin]
@@ -35,8 +35,8 @@
   ["[0]" /
    ["[0]" remote]
    ["/[1]" // "_"
-    ["[1][0]" artifact {"+" Version Artifact}
-     ["[1]/[0]" extension {"+" Extension}]]]]])
+    ["[1][0]" artifact (.only Version Artifact)
+     ["[1]/[0]" extension (.only Extension)]]]]])
 
 (def: artifact
   (-> Version Artifact)
diff --git a/stdlib/source/test/aedifex/repository/identity.lux b/stdlib/source/test/aedifex/repository/identity.lux
index e1b67e424..9dbd6a858 100644
--- a/stdlib/source/test/aedifex/repository/identity.lux
+++ b/stdlib/source/test/aedifex/repository/identity.lux
@@ -1,12 +1,12 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
     [\\specification
      ["$[0]" equivalence]]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]])
 
diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux
index 9c9703d55..d8867b598 100644
--- a/stdlib/source/test/aedifex/repository/local.lux
+++ b/stdlib/source/test/aedifex/repository/local.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
     ["[0]" try ("[1]#[0]" functor)]
     [parser
diff --git a/stdlib/source/test/aedifex/repository/origin.lux b/stdlib/source/test/aedifex/repository/origin.lux
index 90a0f89dd..2f652b513 100644
--- a/stdlib/source/test/aedifex/repository/origin.lux
+++ b/stdlib/source/test/aedifex/repository/origin.lux
@@ -1,12 +1,12 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
     [\\specification
      ["$[0]" equivalence]]]
    [math
-    ["[0]" random {"+" Random}]]]]
+    ["[0]" random (.only Random)]]]]
  [\\program
   ["[0]" /]])
 
diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux
index c20722d4c..79c4987a0 100644
--- a/stdlib/source/test/aedifex/repository/remote.lux
+++ b/stdlib/source/test/aedifex/repository/remote.lux
@@ -1,11 +1,11 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]]
+    [monad (.only do)]]
    [control
-    ["[0]" io {"+" IO}]
+    ["[0]" io (.only IO)]
     ["[0]" maybe ("[1]#[0]" functor)]
     ["[0]" try ("[1]#[0]" monad)]
     ["[0]" exception]
@@ -13,15 +13,15 @@
    [data
     ["[0]" binary ("[1]#[0]" equivalence)]
     ["[0]" text ("[1]#[0]" equivalence)
-     ["%" format {"+" format}]
+     ["%" format (.only format)]
      [encoding
       ["[0]" utf8]]]
     [collection
      ["[0]" dictionary]]]
    [math
-    ["[0]" random {"+" Random}]]
+    ["[0]" random (.only Random)]]
    [world
-    [net {"+" URL}
+    [net (.only URL)
      ["[0]" http "_"
       ["[1]" client]
       ["[1]/[0]" status]
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index 690657d70..a324b2dd4 100644
--- a/stdlib/source/test/aedifex/runtime.lux
+++ b/stdlib/source/test/aedifex/runtime.lux
@@ -1,9 +1,9 @@
 (.using
  [library
   [lux "*"
-   ["_" test {"+" Test}]
+   ["_" test (.only Test)]
    [abstract
-    [monad {"+" do}]
+    [monad (.only do)]
     [\\specification
      ["$[0]" equivalence]]]
    [control
@@ -14,7 +14,7 @@
      ["[0]" list ("[1]#[0]" functor)]
      ["[0]" set]]]
    [math
-    ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+    ["[0]" random (.only Random) ("[1]#[0]" monad)]
     [number
      ["n" nat]]]]]
  [\\program