Outsourced the syntax for labelled type definitions to macros.

28 files changed, 127 insertions, 127 deletions

diff --git a/stdlib/source/test/aedifex/artifact/snapshot.lux b/stdlib/source/test/aedifex/artifact/snapshot.lux
index c4ebdfc66..40fc5e137 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot.lux
@@ -40,7 +40,7 @@
                                 /.format
                                 list
                                 (<xml>.result /.parser)
-                                (try\map (\ /.equivalence = expected))
+                                (try\each (\ /.equivalence = expected))
                                 (try.else false))))
 
                  $/build.test
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/build.lux b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
index d207053c9..ab169fe29 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/build.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/build.lux
@@ -34,6 +34,6 @@
                                 /.format
                                 list
                                 (<xml>.result /.parser)
-                                (try\map (\ /.equivalence = expected))
+                                (try\each (\ /.equivalence = expected))
                                 (try.else false))))
                  ))))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
index ed77767cb..e1903c937 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/stamp.lux
@@ -41,6 +41,6 @@
                      (|> expected
                          /.format
                          (<xml>.result /.parser)
-                         (try\map (\ /.equivalence = expected))
+                         (try\each (\ /.equivalence = expected))
                          (try.else false))))
           )))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/time.lux b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
index 7f33a9e86..22436060e 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/time.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/time.lux
@@ -36,7 +36,7 @@
                          (|> expected
                              /.format
                              (<text>.result /.parser)
-                             (try\map (\ /.equivalence = expected))
+                             (try\each (\ /.equivalence = expected))
                              (try.else false)))
                 ))
           )))
diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version.lux b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
index 3976d7054..f027e0e46 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version.lux
@@ -43,7 +43,7 @@
                          /.format
                          list
                          (<xml>.result /.parser)
-                         (try\map (\ /.equivalence = expected))
+                         (try\each (\ /.equivalence = expected))
                          (try.else false))))
 
           /value.test
diff --git a/stdlib/source/test/aedifex/artifact/time.lux b/stdlib/source/test/aedifex/artifact/time.lux
index 8270969fd..c4f74df92 100644
--- a/stdlib/source/test/aedifex/artifact/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time.lux
@@ -43,7 +43,7 @@
                      (|> expected
                          /.format
                          (<text>.result /.parser)
-                         (try\map (\ /.equivalence = expected))
+                         (try\each (\ /.equivalence = expected))
                          (try.else false))))
           (do random.monad
             [expected ..random]
@@ -51,7 +51,7 @@
                      (|> expected
                          /.instant
                          /.of_instant
-                         (try\map (\ /.equivalence = expected))
+                         (try\each (\ /.equivalence = expected))
                          (try.else false))))
           (_.cover [/.epoch]
                    (instant\= instant.epoch (/.instant /.epoch)))
diff --git a/stdlib/source/test/aedifex/artifact/time/date.lux b/stdlib/source/test/aedifex/artifact/time/date.lux
index c67ade3ec..15eb29aba 100644
--- a/stdlib/source/test/aedifex/artifact/time/date.lux
+++ b/stdlib/source/test/aedifex/artifact/time/date.lux
@@ -49,13 +49,13 @@
                      (|> expected
                          /.format
                          (<text>.result /.parser)
-                         (try\map (\ /.equivalence = expected))
+                         (try\each (\ /.equivalence = expected))
                          (try.else false)))
             (_.cover [/.value /.date]
                      (|> expected
                          /.value
                          /.date
-                         (try\map (\ /.equivalence = expected))
+                         (try\each (\ /.equivalence = expected))
                          (try.else false)))
             (_.cover [/.year_is_out_of_range]
                      (case (/.date candidate)
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index 1f5e4c6e7..7e8317b78 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -33,6 +33,6 @@
                      (|> expected
                          /.format
                          (<text>.result /.parser)
-                         (try\map (\ time.equivalence = expected))
+                         (try\each (\ time.equivalence = expected))
                          (try.else false))))
           )))
diff --git a/stdlib/source/test/aedifex/artifact/versioning.lux b/stdlib/source/test/aedifex/artifact/versioning.lux
index aa90619cb..95019139f 100644
--- a/stdlib/source/test/aedifex/artifact/versioning.lux
+++ b/stdlib/source/test/aedifex/artifact/versioning.lux
@@ -42,13 +42,13 @@
                          /.format
                          list
                          (<xml>.result /.parser)
-                         (try\map (\ /.equivalence = expected))
+                         (try\each (\ /.equivalence = expected))
                          (try.else false))))
           (_.cover [/.init]
                    (|> /.init
                        /.format
                        list
                        (<xml>.result /.parser)
-                       (try\map (\ /.equivalence = /.init))
+                       (try\each (\ /.equivalence = /.init))
                        (try.else false)))
           )))
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 91870d680..143766eb6 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -64,7 +64,7 @@
 (def: content
   (Random Binary)
   (do {! random.monad}
-    [content_size (\ ! map (n.% 100) random.nat)]
+    [content_size (\ ! each (n.% 100) random.nat)]
     (_binary.random content_size)))
 
 (def: package
@@ -82,20 +82,20 @@
   (do {! random.monad}
     [[main_dependency main_package] ..package
      dependencies (|> (//package.dependencies main_package)
-                      (\ try.monad map set.list)
+                      (\ try.monad each set.list)
                       (try.else (list))
-                      (monad.map ! (function (_ dependency)
-                                     (do !
-                                       [pom (random.one (function (_ [identity profile pom])
-                                                          (|> profile
-                                                              (with@ #//.dependencies (set.empty //dependency.hash))
-                                                              (with@ #//.identity (#.Some (value@ #//dependency.artifact dependency)))
-                                                              //pom.write
-                                                              try.maybe))
-                                                        ..profile)
-                                        content ..content]
-                                       (in [dependency
-                                            (with@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))))]
+                      (monad.each ! (function (_ dependency)
+                                      (do !
+                                        [pom (random.one (function (_ [identity profile pom])
+                                                           (|> profile
+                                                               (with@ #//.dependencies (set.empty //dependency.hash))
+                                                               (with@ #//.identity (#.Some (value@ #//dependency.artifact dependency)))
+                                                               //pom.write
+                                                               try.maybe))
+                                                         ..profile)
+                                         content ..content]
+                                        (in [dependency
+                                             (with@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))))]
     (in (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies)))))
 
 (def: singular
@@ -137,7 +137,7 @@
                           [_ wrote!
                            actual read!]
                           (in (\ //dependency/resolution.equivalence =
-                                 (\ dictionary.functor map
+                                 (\ dictionary.functor each
                                     (with@ #//package.origin (#//repository/origin.Local ""))
                                     expected)
                                  actual)))))))))
diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index 1ed19ddf7..91506ca06 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -89,8 +89,8 @@
          home (random.ascii/alpha 5)
          working_directory (random.ascii/alpha 5)
          
-         expected_runs (\ ! map (|>> (n.% 10) (n.max 2)) random.nat)
-         dummy_path (\ ! map (|>> (format source /)) (random.ascii/alpha 5))
+         expected_runs (\ ! each (|>> (n.% 10) (n.max 2)) random.nat)
+         dummy_path (\ ! each (|>> (format source /)) (random.ascii/alpha 5))
          [compiler resolution] $build.resolution]
         ($_ _.and
             (_.cover [/.delay]
@@ -110,15 +110,15 @@
                                                           fs
                                                           (shell.async ($build.good_shell []))
                                                           resolution)
-                                                         (\ ! map (|>> (case> (#try.Failure error)
-                                                                              (same? end_signal error)
+                                                         (\ ! each (|>> (case> (#try.Failure error)
+                                                                               (same? end_signal error)
 
-                                                                              (#try.Success _)
-                                                                              false))))
+                                                                               (#try.Success _)
+                                                                               false))))
                                 correct_number_of_runs! (|> @runs
                                                             atom.read!
                                                             async.future
-                                                            (\ ! map (n.= expected_runs)))]
+                                                            (\ ! each (n.= expected_runs)))]
                                (in (#try.Success (and correct_number_of_runs!
                                                       no_dangling_process!)))))]
                   (_.cover' [/.do!]
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index 03625f0c1..ff5f7450b 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -232,12 +232,12 @@
                                                  actual/1 (\ console read_line [])
                                                  actual/2 (\ console read_line [])
                                                  end! (|> (\ console read_line [])
-                                                          (\ ! map (|>> (case> (#try.Failure error)
-                                                                               true
-                                                                               
-                                                                               (#try.Success _)
-                                                                               false)
-                                                                        #try.Success)))]
+                                                          (\ ! each (|>> (case> (#try.Failure error)
+                                                                                true
+                                                                                
+                                                                                (#try.Success _)
+                                                                                false)
+                                                                         #try.Success)))]
                                                 (in (and (text\= expected/0 actual/0)
                                                          (text\= expected/1 actual/1)
                                                          (text\= expected/2 actual/2)
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index 30ef6eb6f..59908a364 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -43,10 +43,10 @@
 (def: (files prefix)
   (-> Path (Random (List [Path Binary])))
   (do {! random.monad}
-    [count (\ ! map (n.% 10) random.nat)
+    [count (\ ! each (n.% 10) random.nat)
      names (random.set text.hash count ..node_name)
      contents (random.list count ($binary.random 100))]
-    (in (list.zipped/2 (list\map (|>> (format prefix)) (set.list names))
+    (in (list.zipped/2 (list\each (|>> (format prefix)) (set.list names))
                        contents))))
 
 (def: (create_file! fs [path content])
@@ -58,7 +58,7 @@
   (do {! (try.with async.monad)}
     [_ (: (Async (Try Any))
           (file.make_directories async.monad fs path))
-     _ (monad.map ! (..create_file! fs) files)]
+     _ (monad.each ! (..create_file! fs) files)]
     (in [])))
 
 (def: (directory_exists? fs)
@@ -75,8 +75,8 @@
     [directory_exists? (..directory_exists? fs directory_path)
      files_exist? (: (Action (List Bit))
                      (|> files
-                         (list\map product.left)
-                         (monad.map ///action.monad (..file_exists? fs))))]
+                         (list\each product.left)
+                         (monad.each ///action.monad (..file_exists? fs))))]
     (in (and directory_exists?
              (list.every? (|>>) files_exist?)))))
 
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index 526227f2d..b36998b6f 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -84,7 +84,7 @@
                                                (value@ #///.sources)
                                                set.list
                                                (export.library fs)
-                                               (\ ! map (format.result tar.writer)))
+                                               (\ ! each (format.result tar.writer)))
 
                           actual_pom (\ repository download (///repository/remote.uri (value@ #///artifact.version artifact) artifact ///artifact/extension.pom))
                           actual_library (\ repository download (///repository/remote.uri (value@ #///artifact.version artifact) artifact ///artifact/extension.lux_library))
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index f1c0c2de1..93d304d36 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -45,12 +45,12 @@
         ! ///action.monad]
     (|> sources
         set.list
-        (monad.map ! (function (_ head)
-                       (do !
-                         [_ (: (Async (Try Any))
-                               (file.make_directories async.monad fs head))]
-                         (: (Async (Try Any))
-                            (file.make_file async.monad fs (binary.empty 0) (format head / head ".lux")))))))))
+        (monad.each ! (function (_ head)
+                        (do !
+                          [_ (: (Async (Try Any))
+                                (file.make_directories async.monad fs head))]
+                          (: (Async (Try Any))
+                             (file.make_file async.monad fs (binary.empty 0) (format head / head ".lux")))))))))
 
 (def: (execute! program fs sample)
   (-> (Program Async) (file.System Async) ///.Profile (Async (Try Text)))
@@ -65,7 +65,7 @@
   (<| (_.covering /._)
       (do {! random.monad}
         [identity $artifact.random
-         sample (\ ! map (with@ #///.identity (#.Some identity))
+         sample (\ ! each (with@ #///.identity (#.Some identity))
                    $profile.random)
          home (random.ascii/alpha 5)
          working_directory (random.ascii/alpha 5)
@@ -79,16 +79,16 @@
                          library_path (format artifact_path ///artifact/extension.lux_library)
                          pom_path (format artifact_path ///artifact/extension.pom)]
                    verdict (do {! ///action.monad}
-                             [succeeded! (\ ! map (text\= /.success)
+                             [succeeded! (\ ! each (text\= /.success)
                                             (..execute! program fs sample))
                               library_exists! (|> library_path
                                                   (format home /)
                                                   (\ fs file?)
-                                                  (\ async.monad map (|>> #try.Success)))
+                                                  (\ async.monad each (|>> #try.Success)))
                               pom_exists! (|> pom_path
                                               (format home /)
                                               (\ fs file?)
-                                              (\ async.monad map (|>> #try.Success)))]
+                                              (\ async.monad each (|>> #try.Success)))]
                              (in (and succeeded!
                                       library_exists!
                                       pom_exists!)))]
@@ -100,6 +100,6 @@
                    logging (..execute! program fs (with@ #///.identity #.None sample))]
                   (_.cover' [/.failure]
                             (|> logging
-                                (try\map (text\= /.failure))
+                                (try\each (text\= /.failure))
                                 (try.else false)))))
             ))))
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 7c2097a4d..211ce1ad5 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -44,12 +44,12 @@
                 (do !
                   [verdict (do ///action.monad
                              [expected (|> (///pom.write sample)
-                                           (try\map (|>> (\ xml.codec encoded)
-                                                         (\ utf8.codec encoded)))
+                                           (try\each (|>> (\ xml.codec encoded)
+                                                          (\ utf8.codec encoded)))
                                            (\ ! in))
                               actual (\ fs read ///pom.file)
 
-                              logging! (\ ///action.monad map
+                              logging! (\ ///action.monad each
                                           (text\= /.success)
                                           (\ console read_line []))
 
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index 97fd9f1f4..cd92cec74 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -106,7 +106,7 @@
         correct_library_upload!
         (and (|> cache
                  (dictionary.value library_url)
-                 (maybe\map (binary\= expected_library))
+                 (maybe\each (binary\= expected_library))
                  (maybe.else false))
              (dictionary.key? cache (format library_url artifact/extension.sha-1))
              (dictionary.key? cache (format library_url artifact/extension.md5)))
@@ -114,7 +114,7 @@
         correct_pom_upload!
         (and (|> cache
                  (dictionary.value pom_url)
-                 (maybe\map (binary\= expected_pom))
+                 (maybe\each (binary\= expected_pom))
                  (maybe.else false))
              (dictionary.key? cache (format pom_url artifact/extension.sha-1))
              (dictionary.key? cache (format pom_url artifact/extension.md5)))
@@ -147,7 +147,7 @@
   Test
   (<| (_.covering /._)
       (do {! random.monad}
-        [address (\ ! map (text.suffix uri.separator)
+        [address (\ ! each (text.suffix uri.separator)
                     (random.ascii/upper 10))]
         ($_ _.and
             (do {! random.monad}
@@ -161,16 +161,16 @@
                      cache (async.future (atom.read! cache))]
                     (_.cover' [/.one]
                               (|> ?outcome
-                                  (try\map (verify_one 1 address package cache expected_artifact))
+                                  (try\each (verify_one 1 address package cache expected_artifact))
                                   (try.else false))))))
             (do {! random.monad}
               [.let [hash (: (Hash [Dependency Artifact Package])
-                             (\ hash.functor map (|>> product.right product.left product.left)
+                             (\ hash.functor each (|>> product.right product.left product.left)
                                 text.hash))]
-               num_bundles (\ ! map (n.% 10) random.nat)
+               num_bundles (\ ! each (n.% 10) random.nat)
                bundles (|> ..bundle
                            (random.set hash num_bundles)
-                           (\ ! map set.list))
+                           (\ ! each set.list))
                .let [resolution (list\mix (function (_ [dependency expected_artifact package] resolution)
                                             (dictionary.has dependency package resolution))
                                           resolution.empty
@@ -184,21 +184,21 @@
                      cache (async.future (atom.read! cache))]
                     (_.cover' [/.all]
                               (|> ?outcome
-                                  (try\map (function (_ actual_artifacts)
-                                             (let [expected_deployments!
-                                                   (n.= num_bundles (set.size actual_artifacts))
+                                  (try\each (function (_ actual_artifacts)
+                                              (let [expected_deployments!
+                                                    (n.= num_bundles (set.size actual_artifacts))
 
-                                                   every_deployment_was_correct!
-                                                   (list.every? (function (_ [dependency expected_artifact package])
-                                                                  (let [deployed!
-                                                                        (set.member? actual_artifacts expected_artifact)
+                                                    every_deployment_was_correct!
+                                                    (list.every? (function (_ [dependency expected_artifact package])
+                                                                   (let [deployed!
+                                                                         (set.member? actual_artifacts expected_artifact)
 
-                                                                        deployed_correctly!
-                                                                        (verify_one num_bundles address package cache expected_artifact expected_artifact)]
-                                                                    (and deployed!
-                                                                         deployed_correctly!)))
-                                                                bundles)]
-                                               (and expected_deployments!
-                                                    every_deployment_was_correct!))))
+                                                                         deployed_correctly!
+                                                                         (verify_one num_bundles address package cache expected_artifact expected_artifact)]
+                                                                     (and deployed!
+                                                                          deployed_correctly!)))
+                                                                 bundles)]
+                                                (and expected_deployments!
+                                                     every_deployment_was_correct!))))
                                   (try.else false))))))
             ))))
diff --git a/stdlib/source/test/aedifex/hash.lux b/stdlib/source/test/aedifex/hash.lux
index 5e267091d..e91b79e1f 100644
--- a/stdlib/source/test/aedifex/hash.lux
+++ b/stdlib/source/test/aedifex/hash.lux
@@ -30,8 +30,8 @@
     (-> (-> Binary (/.Hash h))
         (Random (/.Hash h))))
   (do {! random.monad}
-    [size (\ ! map (n.% 100) random.nat)]
-    (\ ! map hash (_binary.random size))))
+    [size (\ ! each (n.% 100) random.nat)]
+    (\ ! each hash (_binary.random size))))
 
 (def: .public test
   Test
@@ -55,7 +55,7 @@
 
                                                   (#try.Failure error)
                                                   false)
-                                                (case (<constructor> (\ binary.monoid compose
+                                                (case (<constructor> (\ binary.monoid composite
                                                                         (/.data expected)
                                                                         (/.data expected)))
                                                   (#try.Success actual)
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index 675357e7e..993e67088 100644
--- a/stdlib/source/test/aedifex/input.lux
+++ b/stdlib/source/test/aedifex/input.lux
@@ -45,7 +45,7 @@
   Test
   (<| (_.covering /._)
       (do {! random.monad}
-        [expected (\ ! map (with@ #//.parents (list)) $profile.random)
+        [expected (\ ! each (with@ #//.parents (list)) $profile.random)
          .let [fs (: (file.System Async)
                      (file.mock (\ file.default separator)))]]
         (in (do async.monad
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 85aafa550..eb8b4aec1 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -48,12 +48,12 @@
       (random.ascii/alpha 5)
       (random.list 5 (random.ascii/alpha 5))
       (do {! random.monad}
-        [year (\ ! map (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat)
-         month (\ ! map (|>> (n.% 12) (n.+ 1)) random.nat)
-         day_of_month (\ ! map (|>> (n.% 28) (n.+ 1)) random.nat)
-         hour (\ ! map (n.% 24) random.nat)
-         minute (\ ! map (n.% 60) random.nat)
-         second (\ ! map (n.% 60) random.nat)]
+        [year (\ ! each (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat)
+         month (\ ! each (|>> (n.% 12) (n.+ 1)) random.nat)
+         day_of_month (\ ! each (|>> (n.% 28) (n.+ 1)) random.nat)
+         hour (\ ! each (n.% 24) random.nat)
+         minute (\ ! each (n.% 60) random.nat)
+         second (\ ! each (n.% 60) random.nat)]
         (in (try.trusted
              (do try.monad
                [year (year.year year)
@@ -89,7 +89,7 @@
                            /.format
                            list
                            (<xml>.result /.parser)
-                           (try\map (\ /.equivalence = expected))
+                           (try\each (\ /.equivalence = expected))
                            (try.else false))))
             (_.cover [/.uri]
                      (text\= (//.remote_project_uri artifact)
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index 2c74296e0..5010053a5 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -52,12 +52,12 @@
 (def: random_instant
   (Random Instant)
   (do {! random.monad}
-    [year (\ ! map (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat)
-     month (\ ! map (|>> (n.% 12) (n.+ 1)) random.nat)
-     day_of_month (\ ! map (|>> (n.% 28) (n.+ 1)) random.nat)
-     hour (\ ! map (n.% 24) random.nat)
-     minute (\ ! map (n.% 60) random.nat)
-     second (\ ! map (n.% 60) random.nat)]
+    [year (\ ! each (|>> (n.% 9,000) (n.+ 1,000) .int) random.nat)
+     month (\ ! each (|>> (n.% 12) (n.+ 1)) random.nat)
+     day_of_month (\ ! each (|>> (n.% 28) (n.+ 1)) random.nat)
+     hour (\ ! each (n.% 24) random.nat)
+     minute (\ ! each (n.% 60) random.nat)
+     second (\ ! each (n.% 60) random.nat)]
     (in (try.trusted
          (do try.monad
            [year (year.year year)
@@ -101,7 +101,7 @@
                          /.format
                          list
                          (<xml>.result /.parser)
-                         (try\map (\ /.equivalence = expected))
+                         (try\each (\ /.equivalence = expected))
                          (try.else false)))
             (_.cover [/.uri]
                      (text\= (//.remote_artifact_uri artifact)
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index 7e9cf1dd6..7b2ac3865 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -43,7 +43,7 @@
 (def: .public random
   (Random [//.Profile /.Package])
   (do {! random.monad}
-    [content_size (\ ! map (n.% 100) random.nat)
+    [content_size (\ ! each (n.% 100) random.nat)
      content ($binary.random content_size)
      [profile pom] (random.one (function (_ profile)
                                  (try.maybe
@@ -61,7 +61,7 @@
         [[profile package] ..random]
         ($_ _.and
             (_.for [/.equivalence]
-                   ($equivalence.spec /.equivalence (\ ! map product.right ..random)))
+                   ($equivalence.spec /.equivalence (\ ! each product.right ..random)))
             
             (_.cover [/.local?]
                      (/.local? (with@ #/.origin (#//origin.Local "~/yolo") package)))
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index 6f1516258..de27a0ee8 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -40,12 +40,12 @@
 (def: (list_of random)
   (All [a] (-> (Random a) (Random (List a))))
   (do {! random.monad}
-    [size (\ ! map (n.% 5) random.nat)]
+    [size (\ ! each (n.% 5) random.nat)]
     (random.list size random)))
 
 (def: (dictionary_of key_hash key_random value_random)
   (All [k v] (-> (Hash k) (Random k) (Random v) (Random (Dictionary k v))))
-  (\ random.functor map
+  (\ random.functor each
      (dictionary.of_list key_hash)
      (..list_of (random.and key_random value_random))))
 
@@ -104,10 +104,10 @@
                        (|> expected
                            ..with_empty_profile
                            dictionary.entries
-                           (list\map (function (_ [name profile])
-                                       [name (|> profile
-                                                 ..with_default_sources
-                                                 ..with_default_repository)]))
+                           (list\each (function (_ [name profile])
+                                        [name (|> profile
+                                                  ..with_default_sources
+                                                  ..with_default_repository)]))
                            (dictionary.of_list text.hash)
                            (\ //project.equivalence = actual))
                        
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index 4cb58d0d0..92d755290 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -74,18 +74,18 @@
 (def: (list_of random)
   (All [a] (-> (Random a) (Random (List a))))
   (do {! random.monad}
-    [size (\ ! map (n.% 5) random.nat)]
+    [size (\ ! each (n.% 5) random.nat)]
     (random.list size random)))
 
 (def: (set_of hash random)
   (All [a] (-> (Hash a) (Random a) (Random (Set a))))
-  (\ random.functor map
+  (\ random.functor each
      (set.of_list hash)
      (..list_of random)))
 
 (def: (dictionary_of key_hash key_random value_random)
   (All [k v] (-> (Hash k) (Random k) (Random v) (Random (Dictionary k v))))
-  (\ random.functor map
+  (\ random.functor each
      (dictionary.of_list key_hash)
      (..list_of (random.and key_random value_random))))
 
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index 291935293..ebf37db81 100644
--- a/stdlib/source/test/aedifex/project.lux
+++ b/stdlib/source/test/aedifex/project.lux
@@ -27,7 +27,7 @@
 (def: profile
   (Random [//.Name //.Profile])
   (|> @profile.random
-      (random\map (with@ #//.parents (list)))
+      (random\each (with@ #//.parents (list)))
       (random.and (random.ascii/alpha 1))))
 
 (def: .public random
@@ -63,24 +63,24 @@
                                                   (not (text\= dummy_name name))
                                                   (not (text\= sub_name name))))
                                            (random.ascii/alpha 1))
-                    .let [project ($_ (\ /.monoid compose)
+                    .let [project ($_ (\ /.monoid composite)
                                       (/.project super_name super_profile)
                                       (/.project dummy_name dummy_profile)
                                       (/.project sub_name (with@ #//.parents (list super_name) sub_profile)))
-                          circular ($_ (\ /.monoid compose)
+                          circular ($_ (\ /.monoid composite)
                                        (/.project super_name (with@ #//.parents (list sub_name) super_profile))
                                        (/.project dummy_name dummy_profile)
                                        (/.project sub_name (with@ #//.parents (list super_name) sub_profile)))]]
                    ($_ _.and
                        (_.cover [/.profile]
                                 (and (|> (/.profile super_name project)
-                                         (try\map (\ //.equivalence = super_profile))
+                                         (try\each (\ //.equivalence = super_profile))
                                          (try.else false))
                                      (|> (/.profile dummy_name project)
-                                         (try\map (\ //.equivalence = dummy_profile))
+                                         (try\each (\ //.equivalence = dummy_profile))
                                          (try.else false))
                                      (|> (/.profile sub_name project)
-                                         (try\map (\ //.equivalence = (\ //.monoid compose sub_profile super_profile)))
+                                         (try\each (\ //.equivalence = (\ //.monoid composite sub_profile super_profile)))
                                          (try.else false))))
                        (_.cover [/.unknown_profile]
                                 (case (/.profile fake_name project)
diff --git a/stdlib/source/test/aedifex/repository/local.lux b/stdlib/source/test/aedifex/repository/local.lux
index ccc13752f..34ae887d7 100644
--- a/stdlib/source/test/aedifex/repository/local.lux
+++ b/stdlib/source/test/aedifex/repository/local.lux
@@ -35,7 +35,7 @@
                repo (/.repository program fs)]
 
          uri (random.ascii/lower 10)
-         expected (\ ! map (\ utf8.codec encoded)
+         expected (\ ! each (\ utf8.codec encoded)
                      (random.ascii/lower 10))]
         ($_ _.and
             (in (do async.monad
@@ -47,6 +47,6 @@
                                    (#try.Success _) false
                                    (#try.Failure _) true)
                                  (|> actual
-                                     (try\map (binary\= expected))
+                                     (try\each (binary\= expected))
                                      (try.else false))))))
             ))))
diff --git a/stdlib/source/test/aedifex/repository/remote.lux b/stdlib/source/test/aedifex/repository/remote.lux
index 96d62ef6f..3013d8889 100644
--- a/stdlib/source/test/aedifex/repository/remote.lux
+++ b/stdlib/source/test/aedifex/repository/remote.lux
@@ -48,7 +48,7 @@
            #try.Success
            (if (|> headers
                    (dictionary.value "User-Agent")
-                   (maybe\map (same? /.user_agent))
+                   (maybe\each (same? /.user_agent))
                    (maybe.else false))
              (case [method input]
                [#@http.Get #.None]
@@ -59,7 +59,7 @@
                [#@http.Put (#.Some input)]
                (if (|> headers
                        (dictionary.value "Authorization")
-                       (maybe\map (text\= (//identity.basic_auth user password)))
+                       (maybe\each (text\= (//identity.basic_auth user password)))
                        (maybe.else false))
                  [http/status.created
                   {#@http.headers (http.headers (list))
@@ -90,7 +90,7 @@
          user (random.ascii/lower 10)
          password (random.ascii/lower 10)
 
-         content (\ ! map (\ utf8.codec encoded)
+         content (\ ! each (\ utf8.codec encoded)
                     (random.ascii/lower 10))]
         ($_ _.and
             (_.cover [/.repository /.user_agent /.Address]
@@ -100,13 +100,13 @@
                                               address)]
                        (and (|> (\ repo download uri)
                                 io.run!
-                                (try\map (\ utf8.codec decoded))
-                                try\join
-                                (try\map (text\= (format address uri)))
+                                (try\each (\ utf8.codec decoded))
+                                try\conjoint
+                                (try\each (text\= (format address uri)))
                                 (try.else false))
                             (|> (\ repo upload uri content)
                                 io.run!
-                                (try\map (function.constant true))
+                                (try\each (function.constant true))
                                 (try.else false)))))
             (_.cover [/.upload_failure]
                      (let [repo (/.repository (..good_http user password)
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index 782b20204..d4f116242 100644
--- a/stdlib/source/test/aedifex/runtime.lux
+++ b/stdlib/source/test/aedifex/runtime.lux
@@ -44,7 +44,7 @@
                 (~~ (template [<command>]
                       [(_.cover [/.default_java /.default_js /.default_python /.default_lua /.default_ruby]
                                 (let [listing (|> (list /.default_java /.default_js /.default_python /.default_lua /.default_ruby)
-                                                  (list\map (value@ #/.program)))
+                                                  (list\each (value@ #/.program)))
                                       unique (set.of_list text.hash listing)]
                                   (n.= (list.size listing)
                                        (set.size unique))))]
@@ -62,6 +62,6 @@
                                 (|> runtime'
                                     (value@ #/.parameters)
                                     list.last
-                                    (maybe\map (text\= path))
+                                    (maybe\each (text\= path))
                                     (maybe.else false)))))
                 )))))