4 files changed, 12 insertions, 14 deletions
diff --git a/stdlib/source/library/lux/data/text/escape.lux b/stdlib/source/library/lux/data/text/escape.lux
index fe56f754b..f46331176 100644
--- a/stdlib/source/library/lux/data/text/escape.lux
+++ b/stdlib/source/library/lux/data/text/escape.lux
@@ -23,7 +23,7 @@
 
 (template [<char> <sigil>]
   [(def: <char>
-     (|> <sigil> (//.char 0) maybe.assume))]
+     (|> <sigil> (//.char 0) maybe.trusted))]
 
   [sigil_char ..sigil]
   [\u_sigil "u"]
@@ -31,7 +31,7 @@
 
 (template [<literal> <sigil> <escaped>]
   [(def: <sigil>
-     (|> <literal> (//.char 0) maybe.assume))
+     (|> <literal> (//.char 0) maybe.trusted))
    
    (def: <escaped>
      (format ..sigil <literal>))]
@@ -50,7 +50,7 @@
 
 (template [<char> <text>]
   [(def: <char>
-     (|> <text> (//.char 0) maybe.assume))]
+     (|> <text> (//.char 0) maybe.trusted))]
 
   [\0 //.\0]
   [\a //.\a]
diff --git a/stdlib/source/library/lux/data/text/format.lux b/stdlib/source/library/lux/data/text/format.lux
index 3438e3f96..1a274b692 100644
--- a/stdlib/source/library/lux/data/text/format.lux
+++ b/stdlib/source/library/lux/data/text/format.lux
@@ -121,7 +121,7 @@
 (def: .public (list formatter)
   (All [a] (-> (Format a) (Format (List a))))
   (|>> (list\map (|>> formatter (format " ")))
-       (text.join_with "")
+       text.joined
        (text.enclosed ["(list" ")"])))
 
 (def: .public (maybe format)
diff --git a/stdlib/source/library/lux/data/text/regex.lux b/stdlib/source/library/lux/data/text/regex.lux
index 795bee383..4998e9ce9 100644
--- a/stdlib/source/library/lux/data/text/regex.lux
+++ b/stdlib/source/library/lux/data/text/regex.lux
@@ -52,11 +52,9 @@
   (-> Text (Parser Text))
   (<>.after (<text>.this reference) (<>\in reference)))
 
-(def: (join_text^ part^)
+(def: join_text^
   (-> (Parser (List Text)) (Parser Text))
-  (do <>.monad
-    [parts part^]
-    (in (//.join_with "" parts))))
+  (\ <>.monad map //.joined))
 
 (def: name_char^
   (Parser Text)
@@ -87,9 +85,9 @@
 (def: re_range^
   (Parser Code)
   (do {! <>.monad}
-    [from (|> regex_char^ (\ ! map (|>> (//.char 0) maybe.assume)))
+    [from (|> regex_char^ (\ ! map (|>> (//.char 0) maybe.trusted)))
      _ (<text>.this "-")
-     to (|> regex_char^ (\ ! map (|>> (//.char 0) maybe.assume)))]
+     to (|> regex_char^ (\ ! map (|>> (//.char 0) maybe.trusted)))]
     (in (` ((~! <text>.range) (~ (code.nat from)) (~ (code.nat to)))))))
 
 (def: re_char^
diff --git a/stdlib/source/library/lux/data/text/unicode/set.lux b/stdlib/source/library/lux/data/text/unicode/set.lux
index ab3c1672b..be47d038a 100644
--- a/stdlib/source/library/lux/data/text/unicode/set.lux
+++ b/stdlib/source/library/lux/data/text/unicode/set.lux
@@ -31,7 +31,7 @@
   
   (Tree :@: Block [])
 
-  (def: .public (compose left right)
+  (def: .public (composite left right)
     (-> Set Set Set)
     (:abstraction
      (\ builder branch
@@ -47,7 +47,7 @@
     (-> [Block (List Block)] Set)
     (list\fold (: (-> Block Set Set)
                   (function (_ block set)
-                    (..compose (..singleton block) set)))
+                    (..composite (..singleton block) set)))
                (..singleton head)
                tail))
 
@@ -154,7 +154,7 @@
 
   (def: .public character
     Set
-    ($_ ..compose
+    ($_ ..composite
         ..character/0
         ..character/1
         ..character/2
@@ -197,7 +197,7 @@
 
   (def: .public full
     Set
-    ($_ ..compose
+    ($_ ..composite
         ..character
         ..non_character
         ))