Extensible import syntax [Part 4]

36 files changed, 112 insertions, 113 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)