1 files changed, 59 insertions, 59 deletions
diff --git a/stdlib/source/program/aedifex/cli.lux b/stdlib/source/program/aedifex/cli.lux
index 2bcf90338..135aa0c15 100644
--- a/stdlib/source/program/aedifex/cli.lux
+++ b/stdlib/source/program/aedifex/cli.lux
@@ -1,20 +1,20 @@
 (.using
-  [library
-   [lux "*"
-    [abstract
-     [equivalence {"+" Equivalence}]
-     [monad {"+" do}]]
-    [control
-     ["<>" parser
-      ["[0]" cli {"+" Parser}]]]
-    [data
-     ["[0]" sum]
-     ["[0]" product]
-     ["[0]" text]]]]
-  [//
-   [repository
-    [identity {"+" Identity}]]
-   ["/" profile {"+" Name}]])
+ [library
+  [lux "*"
+   [abstract
+    [equivalence {"+" Equivalence}]
+    [monad {"+" do}]]
+   [control
+    ["<>" parser
+     ["[0]" cli {"+" Parser}]]]
+   [data
+    ["[0]" sum]
+    ["[0]" product]
+    ["[0]" text]]]]
+ [//
+  [repository
+   [identity {"+" Identity}]]
+  ["/" profile {"+" Name}]])
 
 (type: .public Compilation
   (Variant
@@ -50,54 +50,54 @@
 
 (def: .public equivalence
   (Equivalence Command)
-  ($_ sum.equivalence
-      ... #Version
-      ..any_equivalence
-      ... #Clean
-      ..any_equivalence
-      ... #POM
-      ..any_equivalence
-      ... #Dependencies
-      ..any_equivalence
-      ... #Install
-      ..any_equivalence
-      ... #Deploy
-      ($_ product.equivalence
-          text.equivalence
-          text.equivalence
-          text.equivalence)
-      ... #Compilation
-      ..compilation_equivalence
-      ... #Auto
-      ..compilation_equivalence))
+  (all sum.equivalence
+       ... #Version
+       ..any_equivalence
+       ... #Clean
+       ..any_equivalence
+       ... #POM
+       ..any_equivalence
+       ... #Dependencies
+       ..any_equivalence
+       ... #Install
+       ..any_equivalence
+       ... #Deploy
+       (all product.equivalence
+            text.equivalence
+            text.equivalence
+            text.equivalence)
+       ... #Compilation
+       ..compilation_equivalence
+       ... #Auto
+       ..compilation_equivalence))
 
 (def: command'
   (Parser Command)
-  ($_ <>.or
-      (cli.this "version")
-      (cli.this "clean")
-      (cli.this "pom")
-      (cli.this "deps")
-      (cli.this "install")
-      (<>.after (cli.this "deploy")
-                (<>.and cli.any
-                        (<>.and cli.any
-                                cli.any)))
-      ..compilation
-      (<>.after (cli.this "auto")
-                ..compilation)
-      ))
+  (all <>.or
+       (cli.this "version")
+       (cli.this "clean")
+       (cli.this "pom")
+       (cli.this "deps")
+       (cli.this "install")
+       (<>.after (cli.this "deploy")
+                 (<>.and cli.any
+                         (<>.and cli.any
+                                 cli.any)))
+       ..compilation
+       (<>.after (cli.this "auto")
+                 ..compilation)
+       ))
 
 (def: .public command
   (Parser [(List Name) Command])
   (<>.rec
    (function (_ command)
-     ($_ <>.either
-         (<>.after (cli.this "with")
-                   (do <>.monad
-                     [head cli.any
-                      [tail command] command]
-                     (in [{.#Item head tail} command])))
-         (# <>.monad each (|>> [(list)])
-            ..command')
-         ))))
+     (all <>.either
+          (<>.after (cli.this "with")
+                    (do <>.monad
+                      [head cli.any
+                       [tail command] command]
+                      (in [{.#Item head tail} command])))
+          (# <>.monad each (|>> [(list)])
+             ..command')
+          ))))