De-sigil-ification: $

18 files changed, 328 insertions, 328 deletions

diff --git a/stdlib/source/program/aedifex/artifact.lux b/stdlib/source/program/aedifex/artifact.lux
index cc90d0b78..4d3d9cc87 100644
--- a/stdlib/source/program/aedifex/artifact.lux
+++ b/stdlib/source/program/aedifex/artifact.lux
@@ -33,11 +33,11 @@
 
 (def: .public hash
   (Hash Artifact)
-  ($_ product.hash
-      text.hash
-      text.hash
-      text.hash
-      ))
+  (all product.hash
+       text.hash
+       text.hash
+       text.hash
+       ))
 
 (def: .public equivalence
   (Equivalence Artifact)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot.lux b/stdlib/source/program/aedifex/artifact/snapshot.lux
index 8f06a3817..db9fa0891 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot.lux
@@ -1,19 +1,19 @@
 (.using
-  [library
-   [lux {"-" Type}
-    [abstract
-     [equivalence {"+" Equivalence}]
-     [monad {"+" do}]]
-    [control
-     ["<>" parser
-      ["<[0]>" xml {"+" Parser}]
-      ["<[0]>" text]]]
-    [data
-     ["[0]" sum]
-     [format
-      ["[0]" xml {"+" XML}]]]]]
-  ["[0]" / "_"
-   ["[1][0]" stamp {"+" Stamp}]])
+ [library
+  [lux {"-" Type}
+   [abstract
+    [equivalence {"+" Equivalence}]
+    [monad {"+" do}]]
+   [control
+    ["<>" parser
+     ["<[0]>" xml {"+" Parser}]
+     ["<[0]>" text]]]
+   [data
+    ["[0]" sum]
+    [format
+     ["[0]" xml {"+" XML}]]]]]
+ ["[0]" / "_"
+  ["[1][0]" stamp {"+" Stamp}]])
 
 (type: .public Snapshot
   (Variant
@@ -28,10 +28,10 @@
 
 (def: .public equivalence
   (Equivalence Snapshot)
-  ($_ sum.equivalence
-      ..any_equivalence
-      /stamp.equivalence
-      ))
+  (all sum.equivalence
+       ..any_equivalence
+       /stamp.equivalence
+       ))
 
 (template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index f17f27680..55a3957a9 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -23,10 +23,10 @@
 
 (def: .public equivalence
   (Equivalence Stamp)
-  ($_ product.equivalence
-      //time.equivalence
-      //build.equivalence
-      ))
+  (all product.equivalence
+       //time.equivalence
+       //build.equivalence
+       ))
 
 (def: <timestamp>
   xml.Tag
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index 66923459c..e5053ed73 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -25,11 +25,11 @@
 
 (def: .public equivalence
   (Equivalence Version)
-  ($_ product.equivalence
-      text.equivalence
-      text.equivalence
-      ///time.equivalence
-      ))
+  (all product.equivalence
+       text.equivalence
+       text.equivalence
+       ///time.equivalence
+       ))
 
 (template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
@@ -60,9 +60,9 @@
 (def: .public parser
   (Parser Version)
   (<| (<xml>.node ..<snapshot_version>)
-      ($_ <>.and
-          (<xml>.somewhere (..text ..<extension>))
-          (<xml>.somewhere (..text ..<value>))
-          (<xml>.somewhere (<text>.then ///time.parser
-                                        (..text ..<updated>)))
-          )))
+      (all <>.and
+           (<xml>.somewhere (..text ..<extension>))
+           (<xml>.somewhere (..text ..<value>))
+           (<xml>.somewhere (<text>.then ///time.parser
+                                         (..text ..<updated>)))
+           )))
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
index 65d30acdf..63bed8532 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -18,10 +18,10 @@
 
 (def: .public equivalence
   (Equivalence Value)
-  ($_ product.equivalence
-      text.equivalence
-      ///.equivalence
-      ))
+  (all product.equivalence
+       text.equivalence
+       ///.equivalence
+       ))
 
 (def: separator
   "-")
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 377e33a67..16789996f 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -42,11 +42,11 @@
 
 (def: .public equivalence
   (Equivalence Versioning)
-  ($_ product.equivalence
-      //snapshot.equivalence
-      //time.equivalence
-      (list.equivalence //snapshot/version.equivalence)
-      ))
+  (all product.equivalence
+       //snapshot.equivalence
+       //time.equivalence
+       (list.equivalence //snapshot/version.equivalence)
+       ))
 
 (template [<definition> <tag>]
   [(def: <definition> xml.Tag ["" <tag>])]
@@ -83,11 +83,11 @@
 (def: .public parser
   (Parser Versioning)
   (<| (<xml>.node ..<versioning>)
-      ($_ <>.and
-          (<>.else {//snapshot.#Local} (<xml>.somewhere //snapshot.parser))
-          (<>.else //time.epoch (<xml>.somewhere ..last_updated_parser))
-          (<| (<>.else (list))
-              <xml>.somewhere
-              (<xml>.node ..<snapshot_versions>)
-              (<>.some //snapshot/version.parser))
-          )))
+      (all <>.and
+           (<>.else {//snapshot.#Local} (<xml>.somewhere //snapshot.parser))
+           (<>.else //time.epoch (<xml>.somewhere ..last_updated_parser))
+           (<| (<>.else (list))
+               <xml>.somewhere
+               (<xml>.node ..<snapshot_versions>)
+               (<>.some //snapshot/version.parser))
+           )))
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')
+          ))))
diff --git a/stdlib/source/program/aedifex/dependency.lux b/stdlib/source/program/aedifex/dependency.lux
index 4027354d9..edeccc15f 100644
--- a/stdlib/source/program/aedifex/dependency.lux
+++ b/stdlib/source/program/aedifex/dependency.lux
@@ -20,10 +20,10 @@
 
 (def: .public hash
   (Hash Dependency)
-  ($_ product.hash
-      //.hash
-      text.hash
-      ))
+  (all product.hash
+       //.hash
+       text.hash
+       ))
 
 (def: .public equivalence
   (Equivalence Dependency)
diff --git a/stdlib/source/program/aedifex/dependency/status.lux b/stdlib/source/program/aedifex/dependency/status.lux
index bab454ea6..7c66d0688 100644
--- a/stdlib/source/program/aedifex/dependency/status.lux
+++ b/stdlib/source/program/aedifex/dependency/status.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    [abstract
-     [equivalence {"+" Equivalence}]]
-    [data
-     [binary {"+" Binary}]
-     ["[0]" sum]
-     ["[0]" product]]]]
-  ["[0]" /// "_"
-   ["[1][0]" hash {"+" Hash SHA-1 MD5}]])
+ [library
+  [lux "*"
+   [abstract
+    [equivalence {"+" Equivalence}]]
+   [data
+    [binary {"+" Binary}]
+    ["[0]" sum]
+    ["[0]" product]]]]
+ ["[0]" /// "_"
+  ["[1][0]" hash {"+" Hash SHA-1 MD5}]])
 
 (type: .public Status
   (Variant
@@ -25,15 +25,15 @@
 
 (def: .public equivalence
   (Equivalence Status)
-  ($_ sum.equivalence
-      ..any_equivalence
-      ($_ sum.equivalence
-          ///hash.equivalence
-          ///hash.equivalence)
-      ($_ product.equivalence
-          ///hash.equivalence
-          ///hash.equivalence)
-      ))
+  (all sum.equivalence
+       ..any_equivalence
+       (all sum.equivalence
+            ///hash.equivalence
+            ///hash.equivalence)
+       (all product.equivalence
+            ///hash.equivalence
+            ///hash.equivalence)
+       ))
 
 (def: .public (verified payload)
   (-> Binary Status)
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index b5aef41de..285e1c980 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -145,27 +145,27 @@
 (def: .public parser
   (Parser Metadata)
   (<| (<xml>.node ..<metadata>)
-      ($_ <>.and
-          (<xml>.somewhere (..text ..<group>))
-          (<xml>.somewhere (..text ..<name>))
-          (<| (<xml>.node ..<versioning>)
-              ... Handle any ignorable tag.
-              (<>.before (<>.some <xml>.any))
-              ($_ <>.and
-                  (<| <xml>.somewhere
-                      (<xml>.node ..<versions>)
-                      (<>.many (..text ..<version>)))
-                  (<xml>.somewhere ..last_updated_parser)
-                  )))))
+      (all <>.and
+           (<xml>.somewhere (..text ..<group>))
+           (<xml>.somewhere (..text ..<name>))
+           (<| (<xml>.node ..<versioning>)
+               ... Handle any ignorable tag.
+               (<>.before (<>.some <xml>.any))
+               (all <>.and
+                    (<| <xml>.somewhere
+                        (<xml>.node ..<versions>)
+                        (<>.many (..text ..<version>)))
+                    (<xml>.somewhere ..last_updated_parser)
+                    )))))
 
 (def: .public equivalence
   (Equivalence Metadata)
-  ($_ product.equivalence
-      text.equivalence
-      text.equivalence
-      (list.equivalence text.equivalence)
-      instant.equivalence
-      ))
+  (all product.equivalence
+       text.equivalence
+       text.equivalence
+       (list.equivalence text.equivalence)
+       instant.equivalence
+       ))
 
 (def: .public uri
   (-> Artifact URI)
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index a6552ee00..1a4c73059 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -115,10 +115,10 @@
 
 (def: .public equivalence
   (Equivalence Metadata)
-  ($_ product.equivalence
-      ///artifact.equivalence
-      ///artifact/versioning.equivalence
-      ))
+  (all product.equivalence
+       ///artifact.equivalence
+       ///artifact/versioning.equivalence
+       ))
 
 (def: .public uri
   (-> Artifact URI)
diff --git a/stdlib/source/program/aedifex/package.lux b/stdlib/source/program/aedifex/package.lux
index fa0fb33af..2f2a4a157 100644
--- a/stdlib/source/program/aedifex/package.lux
+++ b/stdlib/source/program/aedifex/package.lux
@@ -78,13 +78,13 @@
 
 (def: .public equivalence
   (Equivalence Package)
-  ($_ product.equivalence
-      //origin.equivalence
-      ($_ product.equivalence
-          binary.equivalence
-          //status.equivalence)
-      ($_ product.equivalence
-          xml.equivalence
-          binary.equivalence
-          //status.equivalence)
-      ))
+  (all product.equivalence
+       //origin.equivalence
+       (all product.equivalence
+            binary.equivalence
+            //status.equivalence)
+       (all product.equivalence
+            xml.equivalence
+            binary.equivalence
+            //status.equivalence)
+       ))
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 09ae15ed5..5cc914193 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -58,7 +58,7 @@
 
 (def: artifact'
   (Parser //artifact.Artifact)
-  ($_ <>.and ..group ..name ..version))
+  (all <>.and ..group ..name ..version))
 
 (def: artifact
   (Parser //artifact.Artifact)
@@ -83,13 +83,13 @@
               (dictionary.of_list text.hash)
               (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
-    ($_ <>.and
-        (..singular input "name" ..name)
-        (..singular input "url" ..url)
-        (<>.else {/.#Repo}
-                 (..singular input "type"
-                             (<>.or (<code>.this (' "repo"))
-                                    (<code>.this (' "manual"))))))))
+    (all <>.and
+         (..singular input "name" ..name)
+         (..singular input "url" ..url)
+         (<>.else {/.#Repo}
+                  (..singular input "type"
+                              (<>.or (<code>.this (' "repo"))
+                                     (<code>.this (' "manual"))))))))
 
 (def: organization
   (Parser /.Organization)
@@ -98,9 +98,9 @@
               (dictionary.of_list text.hash)
               (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
-    ($_ <>.and
-        (..singular input "name" ..name)
-        (..singular input "url" ..url))))
+    (all <>.and
+         (..singular input "name" ..name)
+         (..singular input "url" ..url))))
 
 (def: developer
   (Parser /.Developer)
@@ -109,11 +109,11 @@
               (dictionary.of_list text.hash)
               (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
-    ($_ <>.and
-        (..singular input "name" ..name)
-        (..singular input "url" ..url)
-        (<>.maybe (..singular input "organization" ..organization))
-        )))
+    (all <>.and
+         (..singular input "name" ..name)
+         (..singular input "url" ..url)
+         (<>.maybe (..singular input "organization" ..organization))
+         )))
 
 (def: contributor
   (Parser /.Contributor)
@@ -126,16 +126,16 @@
               (dictionary.of_list text.hash)
               (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
-    ($_ <>.and
-        (<>.maybe (..singular input "name" ..name))
-        (<>.maybe (..singular input "url" ..url))
-        (<>.maybe (..singular input "scm" ..scm))
-        (<>.maybe (..singular input "description" ..description))
-        (<>.else (list) (..plural input "licenses" ..license))
-        (<>.maybe (..singular input "organization" ..organization))
-        (<>.else (list) (..plural input "developers" ..developer))
-        (<>.else (list) (..plural input "contributors" ..contributor))
-        )))
+    (all <>.and
+         (<>.maybe (..singular input "name" ..name))
+         (<>.maybe (..singular input "url" ..url))
+         (<>.maybe (..singular input "scm" ..scm))
+         (<>.maybe (..singular input "description" ..description))
+         (<>.else (list) (..plural input "licenses" ..license))
+         (<>.maybe (..singular input "organization" ..organization))
+         (<>.else (list) (..plural input "developers" ..developer))
+         (<>.else (list) (..plural input "contributors" ..contributor))
+         )))
 
 (def: repository
   (Parser //repository.Address)
@@ -148,18 +148,18 @@
 (def: dependency
   (Parser //dependency.Dependency)
   (<code>.tuple
-   ($_ <>.and
-       ..artifact'
-       (<>.else //artifact/type.lux_library ..type)
-       )))
+   (all <>.and
+        ..artifact'
+        (<>.else //artifact/type.lux_library ..type)
+        )))
 
 (def: compiler
   (Parser Compiler)
   (<code>.tuple
-   ($_ <>.and
-       <code>.global
-       (<>.some <code>.text)
-       )))
+   (all <>.and
+        <code>.global
+        (<>.some <code>.text)
+        )))
 
 (def: source
   (Parser /.Source)
@@ -188,10 +188,10 @@
   (let [environment (<>#each (dictionary.of_list text.hash)
                              (<>.some (<code>.tuple (<>.and <code>.text <code>.text))))]
     (<code>.tuple
-     ($_ <>.and
-         environment
-         <code>.text
-         (<>.some <code>.text)))))
+     (all <>.and
+          environment
+          <code>.text
+          (<>.some <code>.text)))))
 
 (def: profile
   (Parser /.Profile)
@@ -260,26 +260,26 @@
            ^ruby (|> ..runtime
                      (..singular input "ruby")
                      (<>.else //runtime.default_ruby))]]
-    ($_ <>.and
-        ^parents
-        ^identity
-        ^info
-        ^repositories
-        ^dependencies
-        ^lux
-        ^compilers
-        ^sources
-        ^target
-        ^program
-        ^test
-        ^deploy_repositories
-        ^configuration
-        ^java
-        ^js
-        ^python
-        ^lua
-        ^ruby
-        )))
+    (all <>.and
+         ^parents
+         ^identity
+         ^info
+         ^repositories
+         ^dependencies
+         ^lux
+         ^compilers
+         ^sources
+         ^target
+         ^program
+         ^test
+         ^deploy_repositories
+         ^configuration
+         ^java
+         ^js
+         ^python
+         ^lua
+         ^ruby
+         )))
 
 (def: .public project
   (Parser Project)
diff --git a/stdlib/source/program/aedifex/pom.lux b/stdlib/source/program/aedifex/pom.lux
index 683e1bb6d..2fe4c6de1 100644
--- a/stdlib/source/program/aedifex/pom.lux
+++ b/stdlib/source/program/aedifex/pom.lux
@@ -128,16 +128,16 @@
 
 (def: (info value)
   (-> /.Info (List XML))
-  ($_ list#composite
-      (|> value (the /.#name) (maybe#each (..property "name")) maybe.list)
-      (|> value (the /.#url) (maybe#each (..property ..url_tag)) maybe.list)
-      (|> value (the /.#description) (maybe#each (..property "description")) maybe.list)
-      (|> value (the /.#licenses) (list#each ..license) (..group "licenses") list)
-      (|> value (the /.#scm) (maybe#each ..scm) maybe.list)
-      (|> value (the /.#organization) (maybe#each ..organization) maybe.list)
-      (|> value (the /.#developers) (list#each ..developer) (..group "developers") list)
-      (|> value (the /.#contributors) (list#each ..contributor) (..group "contributors") list)
-      ))
+  (all list#composite
+       (|> value (the /.#name) (maybe#each (..property "name")) maybe.list)
+       (|> value (the /.#url) (maybe#each (..property ..url_tag)) maybe.list)
+       (|> value (the /.#description) (maybe#each (..property "description")) maybe.list)
+       (|> value (the /.#licenses) (list#each ..license) (..group "licenses") list)
+       (|> value (the /.#scm) (maybe#each ..scm) maybe.list)
+       (|> value (the /.#organization) (maybe#each ..organization) maybe.list)
+       (|> value (the /.#developers) (list#each ..developer) (..group "developers") list)
+       (|> value (the /.#contributors) (list#each ..contributor) (..group "contributors") list)
+       ))
 
 (def: .public (write value)
   (-> /.Profile (Try XML))
@@ -145,16 +145,16 @@
     {.#Some identity}
     {try.#Success
      {_.#Node ["" ..project_tag] _.attributes
-              ($_ list#composite
-                  (list ..version)
-                  (..artifact identity)
-                  (|> value
-                      (the /.#info)
-                      (maybe#each ..info)
-                      (maybe.else (list)))
-                  (|> value (the /.#repositories) set.list (list#each ..repository) (..group "repositories") list)
-                  (|> value (the /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list)
-                  )}}
+              (all list#composite
+                   (list ..version)
+                   (..artifact identity)
+                   (|> value
+                       (the /.#info)
+                       (maybe#each ..info)
+                       (maybe.else (list)))
+                   (|> value (the /.#repositories) set.list (list#each ..repository) (..group "repositories") list)
+                   (|> value (the /.#dependencies) set.list (list#each ..dependency) (..group ..dependencies_tag) list)
+                   )}}
 
     _
     (exception.except /.no_identity [])))
diff --git a/stdlib/source/program/aedifex/profile.lux b/stdlib/source/program/aedifex/profile.lux
index 39f788b4b..0c772a641 100644
--- a/stdlib/source/program/aedifex/profile.lux
+++ b/stdlib/source/program/aedifex/profile.lux
@@ -70,10 +70,10 @@
 
 (def: license_equivalence
   (Equivalence License)
-  ($_ product.equivalence
-      text.equivalence
-      text.equivalence
-      ..distribution_equivalence))
+  (all product.equivalence
+       text.equivalence
+       text.equivalence
+       ..distribution_equivalence))
 
 (type: .public SCM
   URL)
@@ -84,9 +84,9 @@
 
 (def: organization_equivalence
   (Equivalence Organization)
-  ($_ product.equivalence
-      text.equivalence
-      text.equivalence))
+  (all product.equivalence
+       text.equivalence
+       text.equivalence))
 
 (type: .public Email
   Text)
@@ -98,10 +98,10 @@
 
 (def: developer_equivalence
   (Equivalence Developer)
-  ($_ product.equivalence
-      text.equivalence
-      text.equivalence
-      (maybe.equivalence ..organization_equivalence)))
+  (all product.equivalence
+       text.equivalence
+       text.equivalence
+       (maybe.equivalence ..organization_equivalence)))
 
 (type: .public Contributor
   Developer)
@@ -119,15 +119,15 @@
 
 (def: info_equivalence
   (Equivalence Info)
-  ($_ product.equivalence
-      (maybe.equivalence text.equivalence)
-      (maybe.equivalence text.equivalence)
-      (maybe.equivalence text.equivalence)
-      (maybe.equivalence text.equivalence)
-      (list.equivalence ..license_equivalence)
-      (maybe.equivalence ..organization_equivalence)
-      (list.equivalence ..developer_equivalence)
-      (list.equivalence ..developer_equivalence)))
+  (all product.equivalence
+       (maybe.equivalence text.equivalence)
+       (maybe.equivalence text.equivalence)
+       (maybe.equivalence text.equivalence)
+       (maybe.equivalence text.equivalence)
+       (list.equivalence ..license_equivalence)
+       (maybe.equivalence ..organization_equivalence)
+       (list.equivalence ..developer_equivalence)
+       (list.equivalence ..developer_equivalence)))
 
 (def: .public default_info
   Info
@@ -188,43 +188,43 @@
 
 (def: .public equivalence
   (Equivalence Profile)
-  ($_ product.equivalence
-      ... #parents
-      (list.equivalence text.equivalence)
-      ... #identity
-      (maybe.equivalence artifact.equivalence)
-      ... #info
-      (maybe.equivalence ..info_equivalence)
-      ... #repositories
-      set.equivalence
-      ... #dependencies
-      set.equivalence
-      ... #lux
-      dependency.equivalence
-      ... #compilers
-      (list.equivalence compiler.equivalence)
-      ... #sources
-      set.equivalence
-      ... #target
-      text.equivalence
-      ... #program
-      (maybe.equivalence text.equivalence)
-      ... #test
-      (maybe.equivalence text.equivalence)
-      ... #deploy_repositories
-      (dictionary.equivalence text.equivalence)
-      ... #configuration
-      (plist.equivalence text.equivalence)
-      ... #java
-      runtime.equivalence
-      ... #js
-      runtime.equivalence
-      ... #python
-      runtime.equivalence
-      ... #lua
-      runtime.equivalence
-      ... #ruby
-      runtime.equivalence))
+  (all product.equivalence
+       ... #parents
+       (list.equivalence text.equivalence)
+       ... #identity
+       (maybe.equivalence artifact.equivalence)
+       ... #info
+       (maybe.equivalence ..info_equivalence)
+       ... #repositories
+       set.equivalence
+       ... #dependencies
+       set.equivalence
+       ... #lux
+       dependency.equivalence
+       ... #compilers
+       (list.equivalence compiler.equivalence)
+       ... #sources
+       set.equivalence
+       ... #target
+       text.equivalence
+       ... #program
+       (maybe.equivalence text.equivalence)
+       ... #test
+       (maybe.equivalence text.equivalence)
+       ... #deploy_repositories
+       (dictionary.equivalence text.equivalence)
+       ... #configuration
+       (plist.equivalence text.equivalence)
+       ... #java
+       runtime.equivalence
+       ... #js
+       runtime.equivalence
+       ... #python
+       runtime.equivalence
+       ... #lua
+       runtime.equivalence
+       ... #ruby
+       runtime.equivalence))
 
 (implementation: .public monoid
   (Monoid Profile)
diff --git a/stdlib/source/program/aedifex/repository/identity.lux b/stdlib/source/program/aedifex/repository/identity.lux
index 6ab4e380d..88664a868 100644
--- a/stdlib/source/program/aedifex/repository/identity.lux
+++ b/stdlib/source/program/aedifex/repository/identity.lux
@@ -24,10 +24,10 @@
 
 (def: .public equivalence
   (Equivalence Identity)
-  ($_ product.equivalence
-      text.equivalence
-      text.equivalence
-      ))
+  (all product.equivalence
+       text.equivalence
+       text.equivalence
+       ))
 
 (import: java/util/Base64$Encoder
   "[1]::[0]"
diff --git a/stdlib/source/program/aedifex/repository/origin.lux b/stdlib/source/program/aedifex/repository/origin.lux
index d0b5b3436..624ef1e10 100644
--- a/stdlib/source/program/aedifex/repository/origin.lux
+++ b/stdlib/source/program/aedifex/repository/origin.lux
@@ -1,14 +1,14 @@
 (.using
-  [library
-   [lux "*"
-    [abstract
-     [equivalence {"+" Equivalence}]]
-    [data
-     ["[0]" sum]
-     ["[0]" text]]
-    [world
-     [file {"+" Path}]
-     [net {"+" URL}]]]])
+ [library
+  [lux "*"
+   [abstract
+    [equivalence {"+" Equivalence}]]
+   [data
+    ["[0]" sum]
+    ["[0]" text]]
+   [world
+    [file {"+" Path}]
+    [net {"+" URL}]]]])
 
 (type: .public Origin
   (Variant
@@ -17,7 +17,7 @@
 
 (def: .public equivalence
   (Equivalence Origin)
-  ($_ sum.equivalence
-      text.equivalence
-      text.equivalence
-      ))
+  (all sum.equivalence
+       text.equivalence
+       text.equivalence
+       ))
diff --git a/stdlib/source/program/aedifex/runtime.lux b/stdlib/source/program/aedifex/runtime.lux
index f03c80ba1..9657affdc 100644
--- a/stdlib/source/program/aedifex/runtime.lux
+++ b/stdlib/source/program/aedifex/runtime.lux
@@ -23,11 +23,11 @@
 
 (def: .public equivalence
   (Equivalence Runtime)
-  ($_ product.equivalence
-      (dictionary.equivalence text.equivalence)
-      text.equivalence
-      (list.equivalence text.equivalence)
-      ))
+  (all product.equivalence
+       (dictionary.equivalence text.equivalence)
+       text.equivalence
+       (list.equivalence text.equivalence)
+       ))
 
 (template [<name> <command> <environment> <parameters>]
   [(def: .public <name>