Some bug fixes.

23 files changed, 133 insertions, 133 deletions

diff --git a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
index ada815059..915d283da 100644
--- a/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/test/aedifex/artifact/snapshot/version/value.lux
@@ -47,18 +47,18 @@
           (do random.monad
             [sample random
              stamp $///stamp.random]
-            (let [version (get@ #/.version sample)
+            (let [version (value@ #/.version sample)
 
                   local!
                   (text\= version
-                          (/.format (set@ #/.snapshot #///.Local sample)))
+                          (/.format (with@ #/.snapshot #///.Local sample)))
 
                   remote_format (/.format {#/.version (format version /.snapshot)
                                            #/.snapshot (#///.Remote stamp)})
                   remote!
-                  (and (text.starts_with? (format version (///time.format (get@ #///stamp.time stamp)))
+                  (and (text.starts_with? (format version (///time.format (value@ #///stamp.time stamp)))
                                           remote_format)
-                       (text.ends_with? (%.nat (get@ #///stamp.build stamp))
+                       (text.ends_with? (%.nat (value@ #///stamp.build stamp))
                                         remote_format))]
               (_.cover [/.snapshot /.format]
                        (and local!
diff --git a/stdlib/source/test/aedifex/artifact/time/time.lux b/stdlib/source/test/aedifex/artifact/time/time.lux
index 4dcdac3cc..1f5e4c6e7 100644
--- a/stdlib/source/test/aedifex/artifact/time/time.lux
+++ b/stdlib/source/test/aedifex/artifact/time/time.lux
@@ -19,7 +19,7 @@
 
 (def: .public random
   (Random /.Time)
-  (random.one (|>> time.clock (set@ #time.milli_second 0) time.time)
+  (random.one (|>> time.clock (with@ #time.milli_second 0) time.time)
               random.time))
 
 (def: .public test
diff --git a/stdlib/source/test/aedifex/cache.lux b/stdlib/source/test/aedifex/cache.lux
index 44641af70..91870d680 100644
--- a/stdlib/source/test/aedifex/cache.lux
+++ b/stdlib/source/test/aedifex/cache.lux
@@ -57,7 +57,7 @@
                 (try.maybe
                  (do try.monad
                    [pom (//pom.write profile)
-                    identity (try.of_maybe (get@ #//.identity profile))]
+                    identity (try.of_maybe (value@ #//.identity profile))]
                    (in [identity profile pom]))))
               @profile.random))
 
@@ -75,7 +75,7 @@
      content ..content]
     (in [{#//dependency.artifact identity
           #//dependency.type type}
-         (set@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))
+         (with@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))
 
 (def: resolution
   (Random Resolution)
@@ -88,14 +88,14 @@
                                      (do !
                                        [pom (random.one (function (_ [identity profile pom])
                                                           (|> profile
-                                                              (set@ #//.dependencies (set.empty //dependency.hash))
-                                                              (set@ #//.identity (#.Some (get@ #//dependency.artifact dependency)))
+                                                              (with@ #//.dependencies (set.empty //dependency.hash))
+                                                              (with@ #//.identity (#.Some (value@ #//dependency.artifact dependency)))
                                                               //pom.write
                                                               try.maybe))
                                                         ..profile)
                                         content ..content]
                                        (in [dependency
-                                            (set@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))))]
+                                            (with@ #//package.origin (#//repository/origin.Remote "") (//package.local pom content))])))))]
     (in (dictionary.of_list //dependency.hash (list& [main_dependency main_package] dependencies)))))
 
 (def: singular
@@ -116,7 +116,7 @@
                           [_ wrote!
                            actual_package read!]
                           (in (\ //package.equivalence =
-                                 (set@ #//package.origin (#//repository/origin.Local "") expected_package)
+                                 (with@ #//package.origin (#//repository/origin.Local "") expected_package)
                                  actual_package)))))))))
 
 (def: plural
@@ -138,7 +138,7 @@
                            actual read!]
                           (in (\ //dependency/resolution.equivalence =
                                  (\ dictionary.functor map
-                                    (set@ #//package.origin (#//repository/origin.Local ""))
+                                    (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 41d0f080f..ea62b6daa 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -53,7 +53,7 @@
     [@runs
      (function (_ console program fs shell resolution profile)
        (do {! async.monad}
-         [[_ actual_runs] (async.future (atom.update! inc @runs))]
+         [[_ actual_runs] (async.future (atom.update! ++ @runs))]
          (if (n.= expected_runs actual_runs)
            (in (#try.Failure end_signal))
            (do (try.with !)
@@ -77,14 +77,14 @@
          .let [empty_profile (: Profile
                                 (\ ///.monoid identity))
                with_target (: (-> Profile Profile)
-                              (set@ #///.target target))
+                              (with@ #///.target target))
                with_program (: (-> Profile Profile)
-                               (set@ #///.program (#.Some program)))
+                               (with@ #///.program (#.Some program)))
                
                profile (|> empty_profile
                            with_program
                            with_target
-                           (set@ #///.sources (set.of_list text.hash (list source))))]
+                           (with@ #///.sources (set.of_list text.hash (list source))))]
 
          home (random.ascii/alpha 5)
          working_directory (random.ascii/alpha 5)
@@ -103,7 +103,7 @@
                               _ (\ watcher poll [])]
                              (do {! async.monad}
                                [no_dangling_process! (|> profile
-                                                         (set@ #///.compiler compiler)
+                                                         (with@ #///.compiler compiler)
                                                          ((/.do! 1 watcher command)
                                                           ($version.echo "")
                                                           (program.async (program.mock environment.empty home working_directory))
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index 81f331e41..03625f0c1 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -151,9 +151,9 @@
          .let [empty_profile (: Profile
                                 (\ ///.monoid identity))
                with_target (: (-> Profile Profile)
-                              (set@ #///.target target))
+                              (with@ #///.target target))
                with_program (: (-> Profile Profile)
-                               (set@ #///.program (#.Some program)))
+                               (with@ #///.program (#.Some program)))
                
                profile (|> empty_profile
                            with_program
@@ -185,7 +185,7 @@
                     [verdict (do ///action.monad
                                [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
                                          fs shell resolution
-                                         (set@ #///.compiler compiler profile))
+                                         (with@ #///.compiler compiler profile))
                                 start (\ console read_line [])
                                 end (\ console read_line [])]
                                (in (and (text\= /.start start)
@@ -207,7 +207,7 @@
                     [verdict (do ///action.monad
                                [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
                                          fs (shell.async (..bad_shell [])) resolution
-                                         (set@ #///.compiler compiler profile))
+                                         (with@ #///.compiler compiler profile))
                                 start (\ console read_line [])
                                 end (\ console read_line [])]
                                (in (and (text\= /.start start)
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index fffef3033..30ef6eb6f 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -103,7 +103,7 @@
                           context_exists!/pre (..directory_exists? fs context)
                           target_exists!/pre (..assets_exist? fs target_path direct_files)
                           sub_exists!/pre (..assets_exist? fs sub_path sub_files)
-                          _ (/.do! console fs (set@ #///.target target_path dummy))
+                          _ (/.do! console fs (with@ #///.target target_path dummy))
                           context_exists!/post (..directory_exists? fs context)
                           target_exists!/post (..assets_exist? fs target_path direct_files)
                           sub_exists!/post (..assets_exist? fs sub_path sub_files)
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index 4d11234bd..1df6a4180 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -55,7 +55,7 @@
       (Async (Try Text)))
   (do ///action.monad
     [.let [console ($version.echo "")]
-     _ ($install.make_sources! fs (get@ #///.sources profile))
+     _ ($install.make_sources! fs (value@ #///.sources profile))
      _ (/.do! console repository fs artifact profile)]
     (\ console read_line [])))
 
@@ -66,7 +66,7 @@
         [[artifact expected_pom profile]
          (random.one (function (_ profile)
                        (do maybe.monad
-                         [artifact (get@ #///.identity profile)
+                         [artifact (value@ #///.identity profile)
                           expected_pom (try.maybe (///pom.write profile))]
                          (in [artifact expected_pom profile])))
                      $profile.random)
@@ -81,19 +81,19 @@
               [verdict (do {! ///action.monad}
                          [logging (..execute! program repository fs artifact profile)
                           expected_library (|> profile
-                                               (get@ #///.sources)
+                                               (value@ #///.sources)
                                                set.list
                                                (export.library fs)
                                                (\ ! map (format.result tar.writer)))
 
-                          actual_pom (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact ///artifact/extension.pom))
-                          actual_library (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact ///artifact/extension.lux_library))
-                          actual_sha-1 (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1)))
+                          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))
+                          actual_sha-1 (\ repository download (///repository/remote.uri (value@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1)))
                           actual_sha-1 (\ async.monad in
                                           (do try.monad
                                             [actual_sha-1 (\ utf8.codec decode actual_sha-1)]
                                             (\ ///hash.sha-1_codec decode actual_sha-1)))
-                          actual_md5 (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5)))
+                          actual_md5 (\ repository download (///repository/remote.uri (value@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5)))
                           actual_md5 (\ async.monad in
                                         (do try.monad
                                           [actual_md5 (\ utf8.codec decode actual_md5)]
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index 0c6676488..ec45ba697 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -73,25 +73,25 @@
                          #///dependency.type ///artifact/type.lux_library}
 
                dependee_pom (|> (\ ///.monoid identity)
-                                (set@ #///.identity (#.Some dependee_artifact))
+                                (with@ #///.identity (#.Some dependee_artifact))
                                 ///pom.write
                                 try.trusted)
                depender_pom (|> (\ ///.monoid identity)
-                                (set@ #///.identity (#.Some depender_artifact))
-                                (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee)))
+                                (with@ #///.identity (#.Some depender_artifact))
+                                (with@ #///.dependencies (set.of_list ///dependency.hash (list dependee)))
                                 ///pom.write
                                 try.trusted)
                
                dependee_package (|> dependee_package
-                                    (set@ #///package.origin (#///repository/origin.Remote ""))
-                                    (set@ #///package.pom [dependee_pom
-                                                           (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode))
-                                                           #///dependency/status.Unverified]))
+                                    (with@ #///package.origin (#///repository/origin.Remote ""))
+                                    (with@ #///package.pom [dependee_pom
+                                                            (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode))
+                                                            #///dependency/status.Unverified]))
                depender_package (|> depender_package
-                                    (set@ #///package.origin (#///repository/origin.Remote ""))
-                                    (set@ #///package.pom [depender_pom
-                                                           (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode))
-                                                           #///dependency/status.Unverified]))
+                                    (with@ #///package.origin (#///repository/origin.Remote ""))
+                                    (with@ #///package.pom [depender_pom
+                                                            (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode))
+                                                            #///dependency/status.Unverified]))
 
                fs (file.mock (\ file.default separator))
                program (program.async (program.mock environment.empty home working_directory))]]
@@ -103,7 +103,7 @@
                                   (dictionary.has dependee dependee_package)
                                   (///dependency/deployment.all local))
                           post (|> (\ ///.monoid identity)
-                                   (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee depender)))
+                                   (with@ #///.dependencies (set.of_list ///dependency.hash (list dependee depender)))
                                    (/.do! console local
                                           (list (///repository.mock ($///dependency/resolution.single depender_artifact depender_package)
                                                                     []))
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index 86fe5ebea..f1c0c2de1 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -56,7 +56,7 @@
   (-> (Program Async) (file.System Async) ///.Profile (Async (Try Text)))
   (do ///action.monad
     [.let [console ($version.echo "")]
-     _ (..make_sources! fs (get@ #///.sources sample))
+     _ (..make_sources! fs (value@ #///.sources sample))
      _ (/.do! console fs (///repository/local.repository program fs) sample)]
     (\ console read_line [])))
 
@@ -65,7 +65,7 @@
   (<| (_.covering /._)
       (do {! random.monad}
         [identity $artifact.random
-         sample (\ ! map (set@ #///.identity (#.Some identity))
+         sample (\ ! map (with@ #///.identity (#.Some identity))
                    $profile.random)
          home (random.ascii/alpha 5)
          working_directory (random.ascii/alpha 5)
@@ -75,7 +75,7 @@
                   [.let [fs (file.mock /)
                          program (program.async (program.mock environment.empty home working_directory))
 
-                         artifact_path (///local.uri (get@ #///artifact.version identity) identity)
+                         artifact_path (///local.uri (value@ #///artifact.version identity) identity)
                          library_path (format artifact_path ///artifact/extension.lux_library)
                          pom_path (format artifact_path ///artifact/extension.pom)]
                    verdict (do {! ///action.monad}
@@ -97,7 +97,7 @@
             (in (do {! async.monad}
                   [.let [fs (file.mock /)
                          program (program.async (program.mock environment.empty home working_directory))]
-                   logging (..execute! program fs (set@ #///.identity #.None sample))]
+                   logging (..execute! program fs (with@ #///.identity #.None sample))]
                   (_.cover' [/.failure]
                             (|> logging
                                 (try\map (text\= /.failure))
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 9577842c1..b06a7c944 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -62,7 +62,7 @@
                 
                 (#try.Failure error)
                 (_.cover' [/.do!]
-                          (case (get@ #///.identity sample)
+                          (case (value@ #///.identity sample)
                             (#.Some _)
                             false
 
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index f2117fad4..3e3cf85d7 100644
--- a/stdlib/source/test/aedifex/command/test.lux
+++ b/stdlib/source/test/aedifex/command/test.lux
@@ -50,9 +50,9 @@
          .let [empty_profile (: Profile
                                 (\ ///.monoid identity))
                with_target (: (-> Profile Profile)
-                              (set@ #///.target target))
+                              (with@ #///.target target))
                with_test (: (-> Profile Profile)
-                            (set@ #///.test (#.Some test)))
+                            (with@ #///.test (#.Some test)))
                
                profile (|> empty_profile
                            with_test
@@ -65,7 +65,7 @@
                     [verdict (do ///action.monad
                                [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
                                          fs (shell.async (@build.good_shell [])) resolution
-                                         (set@ #///.compiler compiler profile))
+                                         (with@ #///.compiler compiler profile))
                                 build_start (\ console read_line [])
                                 build_end (\ console read_line [])
                                 test_start (\ console read_line [])
@@ -101,7 +101,7 @@
                                                  [])]
                                 _ (/.do! console (program.async (program.mock environment.empty home working_directory))
                                          fs (shell.async bad_shell) resolution
-                                         (set@ #///.compiler compiler profile))
+                                         (with@ #///.compiler compiler profile))
                                 build_start (\ console read_line [])
                                 build_end (\ console read_line [])
                                 test_start (\ console read_line [])
diff --git a/stdlib/source/test/aedifex/dependency/deployment.lux b/stdlib/source/test/aedifex/dependency/deployment.lux
index ae97a70ca..009298783 100644
--- a/stdlib/source/test/aedifex/dependency/deployment.lux
+++ b/stdlib/source/test/aedifex/dependency/deployment.lux
@@ -79,20 +79,20 @@
   (-> Nat URL Package (Dictionary URL Binary) Artifact Artifact Bit)
   (let [url (: (-> URI URL)
                (|>> (format address)))
-        library_url (url (format (artifact.uri (get@ #artifact.version expected_artifact)
+        library_url (url (format (artifact.uri (value@ #artifact.version expected_artifact)
                                                expected_artifact)
                                  artifact/extension.lux_library))
-        pom_url (url (format (artifact.uri (get@ #artifact.version expected_artifact)
+        pom_url (url (format (artifact.uri (value@ #artifact.version expected_artifact)
                                            expected_artifact)
                              artifact/extension.pom))
         artifact_metadata_url (url (metadata.remote_artifact_uri expected_artifact))
         project_metadata_url (url (metadata.remote_project_uri expected_artifact))
 
         expected_library (|> package
-                             (get@ #package.library)
+                             (value@ #package.library)
                              product.left)
         expected_pom (|> package
-                         (get@ #package.pom)
+                         (value@ #package.pom)
                          product.right
                          product.left)
 
@@ -136,7 +136,7 @@
   (do random.monad
     [[profile package] $///package.random
      .let [artifact (|> profile
-                        (get@ #profile.identity)
+                        (value@ #profile.identity)
                         maybe.trusted)
            dependency (: Dependency
                          [artifact
diff --git a/stdlib/source/test/aedifex/dependency/resolution.lux b/stdlib/source/test/aedifex/dependency/resolution.lux
index c7f7d6d40..44420243d 100644
--- a/stdlib/source/test/aedifex/dependency/resolution.lux
+++ b/stdlib/source/test/aedifex/dependency/resolution.lux
@@ -98,7 +98,7 @@
 
 (def: .public (single artifact package)
   (-> Artifact Package (Mock Any))
-  (let [expected (///artifact.uri (get@ #///artifact.version artifact) artifact)]
+  (let [expected (///artifact.uri (value@ #///artifact.version artifact) artifact)]
     (implementation
      (def: the_description
        "[1]")
@@ -106,11 +106,11 @@
        (if (text.contains? expected uri)
          (let [library (: Binary
                           (|> package
-                              (get@ #///package.library)
+                              (value@ #///package.library)
                               product.left))
                pom (: Binary
                       (|> package
-                          (get@ #///package.pom)
+                          (value@ #///package.pom)
                           product.left
                           (\ xml.codec encode)
                           (\ utf8.codec encode)))]
@@ -144,34 +144,34 @@
    (def: the_description
      "[~SHA-1]")
    (def: (on_download uri state)
-     (if (text.contains? (///artifact.uri (get@ #///artifact.version expected_artifact) expected_artifact) uri)
+     (if (text.contains? (///artifact.uri (value@ #///artifact.version expected_artifact) expected_artifact) uri)
        (cond (text.ends_with? ///artifact/extension.lux_library uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.library)
+                                      (value@ #///package.library)
                                       product.left)])
 
              (text.ends_with? ..lux_sha-1 uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.library)
+                                      (value@ #///package.library)
                                       product.left
                                       ..sha-1)])
 
              (text.ends_with? ..lux_md5 uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.library)
+                                      (value@ #///package.library)
                                       product.left
                                       ..md5)])
              
              (text.ends_with? ///artifact/extension.pom uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.pom)
+                                      (value@ #///package.pom)
                                       product.left
                                       (\ xml.codec encode)
                                       (\ utf8.codec encode))])
 
              (text.ends_with? ..pom_sha-1 uri)
              (#try.Success [state (|> dummy_package
-                                      (get@ #///package.pom)
+                                      (value@ #///package.pom)
                                       product.left
                                       (\ xml.codec encode)
                                       (\ utf8.codec encode)
@@ -179,7 +179,7 @@
 
              (text.ends_with? ..pom_md5 uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.pom)
+                                      (value@ #///package.pom)
                                       product.left
                                       (\ xml.codec encode)
                                       (\ utf8.codec encode)
@@ -197,34 +197,34 @@
    (def: the_description
      "[~MD5]")
    (def: (on_download uri state)
-     (if (text.contains? (///artifact.uri (get@ #///artifact.version expected_artifact) expected_artifact) uri)
+     (if (text.contains? (///artifact.uri (value@ #///artifact.version expected_artifact) expected_artifact) uri)
        (cond (text.ends_with? ///artifact/extension.lux_library uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.library)
+                                      (value@ #///package.library)
                                       product.left)])
 
              (text.ends_with? ..lux_sha-1 uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.library)
+                                      (value@ #///package.library)
                                       product.left
                                       ..sha-1)])
 
              (text.ends_with? ..lux_md5 uri)
              (#try.Success [state (|> dummy_package
-                                      (get@ #///package.library)
+                                      (value@ #///package.library)
                                       product.left
                                       ..md5)])
              
              (text.ends_with? ///artifact/extension.pom uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.pom)
+                                      (value@ #///package.pom)
                                       product.left
                                       (\ xml.codec encode)
                                       (\ utf8.codec encode))])
 
              (text.ends_with? ..pom_sha-1 uri)
              (#try.Success [state (|> expected_package
-                                      (get@ #///package.pom)
+                                      (value@ #///package.pom)
                                       product.left
                                       (\ xml.codec encode)
                                       (\ utf8.codec encode)
@@ -232,7 +232,7 @@
 
              (text.ends_with? ..pom_md5 uri)
              (#try.Success [state (|> dummy_package
-                                      (get@ #///package.pom)
+                                      (value@ #///package.pom)
                                       product.left
                                       (\ xml.codec encode)
                                       (\ utf8.codec encode)
@@ -250,7 +250,7 @@
     [expected_artifact $///artifact.random
      [_ expected_package] $///package.random
      [_ dummy_package] (random.only (|>> product.right
-                                         (set@ #///package.pom (get@ #///package.pom expected_package))
+                                         (with@ #///package.pom (value@ #///package.pom expected_package))
                                          (\ ///package.equivalence = expected_package)
                                          not)
                                     $///package.random)
@@ -266,7 +266,7 @@
                             (case actual_package
                               (#try.Success actual_package)
                               (\ ///package.equivalence =
-                                 (set@ #///package.origin (#///repository/origin.Remote "") expected_package)
+                                 (with@ #///package.origin (#///repository/origin.Remote "") expected_package)
                                  actual_package)
                               
                               (#try.Failure _)
@@ -295,7 +295,7 @@
     [expected_artifact $///artifact.random
      [_ expected_package] $///package.random
      [_ dummy_package] (random.only (|>> product.right
-                                         (set@ #///package.pom (get@ #///package.pom expected_package))
+                                         (with@ #///package.pom (value@ #///package.pom expected_package))
                                          (\ ///package.equivalence = expected_package)
                                          not)
                                     $///package.random)
@@ -315,7 +315,7 @@
                         (case actual_package
                           (#try.Success actual_package)
                           (\ ///package.equivalence =
-                             (set@ #///package.origin (#///repository/origin.Remote "") expected_package)
+                             (with@ #///package.origin (#///repository/origin.Remote "") expected_package)
                              actual_package)
                           
                           (#try.Failure _)
@@ -344,8 +344,8 @@
                                      (\ ///artifact.equivalence = dependee_artifact))
                                     $///artifact.random)
      ignored_artifact (random.only (predicate.complement
-                                    (predicate.unite (\ ///artifact.equivalence = dependee_artifact)
-                                                     (\ ///artifact.equivalence = depender_artifact)))
+                                    (predicate.and (\ ///artifact.equivalence = dependee_artifact)
+                                                   (\ ///artifact.equivalence = depender_artifact)))
                                    $///artifact.random)]
     (in [dependee_artifact depender_artifact ignored_artifact])))
 
@@ -366,34 +366,34 @@
                     #///dependency.type ///artifact/type.lux_library}
 
            dependee_pom (|> (\ ///.monoid identity)
-                            (set@ #///.identity (#.Some dependee_artifact))
+                            (with@ #///.identity (#.Some dependee_artifact))
                             ///pom.write
                             try.trusted)
            depender_pom (|> (\ ///.monoid identity)
-                            (set@ #///.identity (#.Some depender_artifact))
-                            (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee)))
+                            (with@ #///.identity (#.Some depender_artifact))
+                            (with@ #///.dependencies (set.of_list ///dependency.hash (list dependee)))
                             ///pom.write
                             try.trusted)
            ignored_pom (|> (\ ///.monoid identity)
-                           (set@ #///.identity (#.Some ignored_artifact))
+                           (with@ #///.identity (#.Some ignored_artifact))
                            ///pom.write
                            try.trusted)
 
-           dependee_package (set@ #///package.pom
-                                  [dependee_pom
-                                   (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode))
+           dependee_package (with@ #///package.pom
+                                   [dependee_pom
+                                    (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode))
+                                    #///dependency/status.Unverified]
+                                   dependee_package)
+           depender_package (with@ #///package.pom
+                                   [depender_pom
+                                    (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode))
+                                    #///dependency/status.Unverified]
+                                   depender_package)
+           ignored_package (with@ #///package.pom
+                                  [ignored_pom
+                                   (|> ignored_pom (\ xml.codec encode) (\ utf8.codec encode))
                                    #///dependency/status.Unverified]
-                                  dependee_package)
-           depender_package (set@ #///package.pom
-                                  [depender_pom
-                                   (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode))
-                                   #///dependency/status.Unverified]
-                                  depender_package)
-           ignored_package (set@ #///package.pom
-                                 [ignored_pom
-                                  (|> ignored_pom (\ xml.codec encode) (\ utf8.codec encode))
-                                  #///dependency/status.Unverified]
-                                 ignored_package)]]
+                                  ignored_package)]]
     (in [[dependee depender ignored]
          [dependee_package depender_package ignored_package]])))
 
diff --git a/stdlib/source/test/aedifex/input.lux b/stdlib/source/test/aedifex/input.lux
index 086551be0..1c47fdd6f 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 (set@ #//.parents (list)) $profile.random)
+        [expected (\ ! map (with@ #//.parents (list)) $profile.random)
          .let [fs (: (file.System Async)
                      (file.mock (\ file.default separator)))]]
         (in (do async.monad
@@ -59,8 +59,8 @@
                                     (/.read async.monad fs //.default))]
                          (in (\ //.equivalence =
                                 (|> expected
-                                    (update@ #//.sources ..with_default_source)
-                                    (update@ #//.repositories ..with_default_repository))
+                                    (revised@ #//.sources ..with_default_source)
+                                    (revised@ #//.repositories ..with_default_repository))
                                 actual)))]
               (_.cover' [/.read]
                         (try.else false verdict)))))))
diff --git a/stdlib/source/test/aedifex/local.lux b/stdlib/source/test/aedifex/local.lux
index a797f2a97..a8c0702bb 100644
--- a/stdlib/source/test/aedifex/local.lux
+++ b/stdlib/source/test/aedifex/local.lux
@@ -23,5 +23,5 @@
         ($_ _.and
             (_.cover [/.repository /.uri]
                      (text.starts_with? /.repository
-                                        (/.uri (get@ #//artifact.version sample) sample)))
+                                        (/.uri (value@ #//artifact.version sample) sample)))
             ))))
diff --git a/stdlib/source/test/aedifex/metadata/artifact.lux b/stdlib/source/test/aedifex/metadata/artifact.lux
index 46ebf4eae..85aafa550 100644
--- a/stdlib/source/test/aedifex/metadata/artifact.lux
+++ b/stdlib/source/test/aedifex/metadata/artifact.lux
@@ -72,10 +72,10 @@
       (_.for [/.Metadata])
       (do random.monad
         [expected ..random
-         .let [artifact {#///artifact.group (get@ #/.group expected)
-                         #///artifact.name (get@ #/.name expected)
+         .let [artifact {#///artifact.group (value@ #/.group expected)
+                         #///artifact.name (value@ #/.name expected)
                          #///artifact.version (|> expected
-                                                  (get@ #/.versions)
+                                                  (value@ #/.versions)
                                                   list.head
                                                   (maybe.else ""))}]]
         ($_ _.and
diff --git a/stdlib/source/test/aedifex/metadata/snapshot.lux b/stdlib/source/test/aedifex/metadata/snapshot.lux
index d5dc8595e..2c74296e0 100644
--- a/stdlib/source/test/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/test/aedifex/metadata/snapshot.lux
@@ -91,7 +91,7 @@
       (_.for [/.Metadata])
       (do random.monad
         [expected ..random
-         .let [artifact (get@ #/.artifact expected)]]
+         .let [artifact (value@ #/.artifact expected)]]
         ($_ _.and
             (_.for [/.equivalence]
                    ($equivalence.spec /.equivalence ..random))
diff --git a/stdlib/source/test/aedifex/package.lux b/stdlib/source/test/aedifex/package.lux
index e05c1d753..9596eb63f 100644
--- a/stdlib/source/test/aedifex/package.lux
+++ b/stdlib/source/test/aedifex/package.lux
@@ -64,18 +64,18 @@
                    ($equivalence.spec /.equivalence (\ ! map product.right ..random)))
             
             (_.cover [/.local?]
-                     (/.local? (set@ #/.origin (#//origin.Local "~/yolo") package)))
+                     (/.local? (with@ #/.origin (#//origin.Local "~/yolo") package)))
             (_.cover [/.remote?]
-                     (/.remote? (set@ #/.origin (#//origin.Remote "https://example.com") package)))
+                     (/.remote? (with@ #/.origin (#//origin.Remote "https://example.com") package)))
             (_.cover [/.local]
-                     (let [expected_pom (|> package (get@ #/.pom) product.left)
-                           expected_library (|> package (get@ #/.library) product.left)
+                     (let [expected_pom (|> package (value@ #/.pom) product.left)
+                           expected_library (|> package (value@ #/.library) product.left)
 
                            local (/.local expected_pom expected_library)
 
-                           [actual_pom binary_pom pom_status] (get@ #/.pom local)
-                           [actual_library library_status] (get@ #/.library local)]
-                       (and (case (get@ #/.origin local)
+                           [actual_pom binary_pom pom_status] (value@ #/.pom local)
+                           [actual_library library_status] (value@ #/.library local)]
+                       (and (case (value@ #/.origin local)
                               (#//origin.Local "") true
                               _ false)
                             (let [expected_sha1 (//hash.sha-1 expected_library)
@@ -104,7 +104,7 @@
                                      _
                                      false))))))
             (_.cover [/.dependencies]
-                     (let [expected (get@ #//.dependencies profile)]
+                     (let [expected (value@ #//.dependencies profile)]
                        (case (/.dependencies package)
                          (#try.Success actual)
                          (\ set.equivalence = expected actual)
@@ -112,7 +112,7 @@
                          (#try.Failure error)
                          false)))
             (_.cover [/.repositories]
-                     (let [expected (get@ #//.repositories profile)]
+                     (let [expected (value@ #//.repositories profile)]
                        (case (/.repositories package)
                          (#try.Success actual)
                          (\ set.equivalence = expected actual)
diff --git a/stdlib/source/test/aedifex/parser.lux b/stdlib/source/test/aedifex/parser.lux
index 152123d55..6f1516258 100644
--- a/stdlib/source/test/aedifex/parser.lux
+++ b/stdlib/source/test/aedifex/parser.lux
@@ -55,16 +55,16 @@
 
 (def: with_default_sources
   (-> //.Profile //.Profile)
-  (update@ #//.sources
-           (: (-> (Set //.Source) (Set //.Source))
-              (function (_ sources)
-                (if (set.empty? sources)
-                  (set.of_list text.hash (list //.default_source))
-                  sources)))))
+  (revised@ #//.sources
+            (: (-> (Set //.Source) (Set //.Source))
+               (function (_ sources)
+                 (if (set.empty? sources)
+                   (set.of_list text.hash (list //.default_source))
+                   sources)))))
 
 (def: with_default_repository
   (-> //.Profile //.Profile)
-  (update@ #//.repositories (set.has //.default_repository)))
+  (revised@ #//.repositories (set.has //.default_repository)))
 
 (def: single_profile
   Test
diff --git a/stdlib/source/test/aedifex/pom.lux b/stdlib/source/test/aedifex/pom.lux
index f51ac9abc..e413b69ed 100644
--- a/stdlib/source/test/aedifex/pom.lux
+++ b/stdlib/source/test/aedifex/pom.lux
@@ -34,15 +34,15 @@
             [expected @profile.random]
             (_.cover [/.write /.parser]
                      (case [(/.write expected)
-                            (get@ #//.identity expected)]
+                            (value@ #//.identity expected)]
                        [(#try.Success pom)
                         (#.Some _)]
                        (case (<xml>.result /.parser (list pom))
                          (#try.Success actual)
                          (\ //.equivalence =
                             (|> (\ //.monoid identity)
-                                (set@ #//.dependencies (get@ #//.dependencies expected))
-                                (set@ #//.repositories (get@ #//.repositories expected)))
+                                (with@ #//.dependencies (value@ #//.dependencies expected))
+                                (with@ #//.repositories (value@ #//.repositories expected)))
                             actual)
 
                          (#try.Failure error)
diff --git a/stdlib/source/test/aedifex/profile.lux b/stdlib/source/test/aedifex/profile.lux
index b1ec22e6c..4cb58d0d0 100644
--- a/stdlib/source/test/aedifex/profile.lux
+++ b/stdlib/source/test/aedifex/profile.lux
@@ -154,10 +154,10 @@
                               (text\= "" /.default))
                      (_.cover [/.default_compiler]
                               (|> (\ /.monoid identity)
-                                  (get@ #/.compiler)
+                                  (value@ #/.compiler)
                                   (same? /.default_compiler)))
                      (_.cover [/.default_target]
                               (|> (\ /.monoid identity)
-                                  (get@ #/.target)
+                                  (value@ #/.target)
                                   (same? /.default_target)))
                      )))))
diff --git a/stdlib/source/test/aedifex/project.lux b/stdlib/source/test/aedifex/project.lux
index 3d027eec7..291935293 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 (set@ #//.parents (list)))
+      (random\map (with@ #//.parents (list)))
       (random.and (random.ascii/alpha 1))))
 
 (def: .public random
@@ -66,11 +66,11 @@
                     .let [project ($_ (\ /.monoid compose)
                                       (/.project super_name super_profile)
                                       (/.project dummy_name dummy_profile)
-                                      (/.project sub_name (set@ #//.parents (list super_name) sub_profile)))
+                                      (/.project sub_name (with@ #//.parents (list super_name) sub_profile)))
                           circular ($_ (\ /.monoid compose)
-                                       (/.project super_name (set@ #//.parents (list sub_name) super_profile))
+                                       (/.project super_name (with@ #//.parents (list sub_name) super_profile))
                                        (/.project dummy_name dummy_profile)
-                                       (/.project sub_name (set@ #//.parents (list super_name) sub_profile)))]]
+                                       (/.project sub_name (with@ #//.parents (list super_name) sub_profile)))]]
                    ($_ _.and
                        (_.cover [/.profile]
                                 (and (|> (/.profile super_name project)
diff --git a/stdlib/source/test/aedifex/runtime.lux b/stdlib/source/test/aedifex/runtime.lux
index c9e61b017..782b20204 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 (get@ #/.program)))
+                                                  (list\map (value@ #/.program)))
                                       unique (set.of_list text.hash listing)]
                                   (n.= (list.size listing)
                                        (set.size unique))))]
@@ -57,10 +57,10 @@
                       ))
                 (_.cover [/.for]
                          (let [runtime' (/.for runtime path)]
-                           (and (text\= (get@ #/.program runtime)
-                                        (get@ #/.program runtime'))
+                           (and (text\= (value@ #/.program runtime)
+                                        (value@ #/.program runtime'))
                                 (|> runtime'
-                                    (get@ #/.parameters)
+                                    (value@ #/.parameters)
                                     list.last
                                     (maybe\map (text\= path))
                                     (maybe.else false)))))