9 files changed, 41 insertions, 42 deletions
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