De-sigil-ification: !

16 files changed, 238 insertions, 238 deletions

diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index 999331c91..49d9df8ca 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -1351,8 +1351,8 @@
             _
             {.#None})))]
 
-  [pass! #Pass]
-  [hint! #Hint]
+  [pass #Pass]
+  [hint #Hint]
   )
 
 (template [<name> <type> <method>]
@@ -1426,12 +1426,12 @@
                                                       (|>> {#Pass})
                                                       (|>> {#Hint}))
                                              (method_signature method_style method)))))))]
-    (case (list.all pass! candidates)
+    (case (list.all pass candidates)
       {.#Item method {.#End}}
       (in method)
 
       {.#End}
-      (/////analysis.except ..no_candidates [actual_class_tvars class_name method_name actual_method_tvars inputsJT (list.all hint! candidates)])
+      (/////analysis.except ..no_candidates [actual_class_tvars class_name method_name actual_method_tvars inputsJT (list.all hint candidates)])
       
       {.#Item method alternatives}
       (if allow_inheritance?
@@ -1460,12 +1460,12 @@
                                            (|>> {#Pass})
                                            (|>> {#Hint}))
                                          (constructor_signature constructor))))))]
-    (case (list.all pass! candidates)
+    (case (list.all pass candidates)
       {.#Item constructor {.#End}}
       (in constructor)
 
       {.#End}
-      (/////analysis.except ..no_candidates [actual_class_tvars class_name ..constructor_method actual_method_tvars inputsJT (list.all hint! candidates)])
+      (/////analysis.except ..no_candidates [actual_class_tvars class_name ..constructor_method actual_method_tvars inputsJT (list.all hint candidates)])
       
       candidates
       (/////analysis.except ..too_many_candidates [actual_class_tvars class_name ..constructor_method actual_method_tvars inputsJT candidates]))))
@@ -1807,7 +1807,7 @@
 (def: .public abstract_method_definition
   (Parser (Abstract_Method Code))
   (<| <code>.form
-      (<>.after (<code>.text! ..abstract_tag))
+      (<>.after (<code>.this_text ..abstract_tag))
       ($_ <>.and
           <code>.text
           ..visibility
@@ -1869,7 +1869,7 @@
 (def: .public constructor_definition
   (Parser (Constructor Code))
   (<| <code>.form
-      (<>.after (<code>.text! ..constructor_tag))
+      (<>.after (<code>.this_text ..constructor_tag))
       ($_ <>.and
           ..visibility
           <code>.bit
@@ -1949,7 +1949,7 @@
 (def: .public virtual_method_definition
   (Parser (Virtual_Method Code))
   (<| <code>.form
-      (<>.after (<code>.text! ..virtual_tag))
+      (<>.after (<code>.this_text ..virtual_tag))
       ($_ <>.and
           <code>.text
           ..visibility
@@ -2047,7 +2047,7 @@
 (def: .public static_method_definition
   (Parser (Static_Method Code))
   (<| <code>.form
-      (<>.after (<code>.text! ..static_tag))
+      (<>.after (<code>.this_text ..static_tag))
       ($_ <>.and
           <code>.text
           ..visibility
@@ -2121,7 +2121,7 @@
 (def: .public overriden_method_definition
   (Parser (Overriden_Method Code))
   (<| <code>.form
-      (<>.after (<code>.text! ..overriden_tag))
+      (<>.after (<code>.this_text ..overriden_tag))
       ($_ <>.and
           ..class
           <code>.text
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
index 0ec22f549..ab72fe131 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/jvm.lux
@@ -128,7 +128,7 @@
   (Parser (Modifier class.Class))
   (`` ($_ <>.either
           (~~ (template [<label> <modifier>]
-                [(<>.after (<code>.text! <label>) (<>#in <modifier>))]
+                [(<>.after (<code>.this_text <label>) (<>#in <modifier>))]
 
                 ["final" class.final]
                 ["abstract" class.abstract]
@@ -138,7 +138,7 @@
   (Parser (Modifier field.Field))
   (`` ($_ <>.either
           (~~ (template [<label> <modifier>]
-                [(<>.after (<code>.text! <label>) (<>#in <modifier>))]
+                [(<>.after (<code>.this_text <label>) (<>#in <modifier>))]
 
                 ["volatile" field.volatile]
                 ["final" field.final]
@@ -160,7 +160,7 @@
 (def: constant
   (Parser Constant)
   (<| <code>.form
-      (<>.after (<code>.text! "constant"))
+      (<>.after (<code>.this_text "constant"))
       ($_ <>.and
           <code>.text
           (<code>.tuple (<>.some ..annotation))
@@ -174,12 +174,12 @@
 (def: variable
   (Parser Variable)
   (<| <code>.form
-      (<>.after (<code>.text! "variable"))
+      (<>.after (<code>.this_text "variable"))
       ($_ <>.and
           <code>.text
           ..visibility
           ..state
-          (<>.parses? (<code>.text! jvm.static_tag))
+          (<>.parses? (<code>.this_text jvm.static_tag))
           (<code>.tuple (<>.some ..annotation))
           ..field_type
           )))
@@ -296,7 +296,7 @@
       (<synthesis>.loop (<>.exactly 0 <synthesis>.any))
       <synthesis>.tuple
       ($_ <>.either
-          (<| (<>.after (<synthesis>.text! ""))
+          (<| (<>.after (<synthesis>.this_text ""))
               (<>#each (host.hidden_method_body arity))
               <synthesis>.any)
           <synthesis>.any)))
@@ -304,7 +304,7 @@
 (def: constructor_synthesis
   (<synthesis>.Parser (jvm.Constructor Synthesis))
   (<| <synthesis>.tuple
-      (<>.after (<synthesis>.text! jvm.constructor_tag))
+      (<>.after (<synthesis>.this_text jvm.constructor_tag))
       ($_ <>.and
           (<text>.then jvm.visibility' <synthesis>.text)
           <synthesis>.bit
@@ -323,7 +323,7 @@
 (def: overriden_method_synthesis
   (<synthesis>.Parser (jvm.Overriden_Method Synthesis))
   (<| <synthesis>.tuple
-      (<>.after (<synthesis>.text! jvm.overriden_tag))
+      (<>.after (<synthesis>.this_text jvm.overriden_tag))
       ($_ <>.and
           ..class_type_synthesis
           <synthesis>.text
@@ -343,7 +343,7 @@
 (def: virtual_method_synthesis
   (<synthesis>.Parser (jvm.Virtual_Method Synthesis))
   (<| <synthesis>.tuple
-      (<>.after (<synthesis>.text! jvm.virtual_tag))
+      (<>.after (<synthesis>.this_text jvm.virtual_tag))
       ($_ <>.and
           <synthesis>.text
           (<text>.then jvm.visibility' <synthesis>.text)
@@ -364,7 +364,7 @@
 (def: static_method_synthesis
   (<synthesis>.Parser (jvm.Static_Method Synthesis))
   (<| <synthesis>.tuple
-      (<>.after (<synthesis>.text! jvm.static_tag))
+      (<>.after (<synthesis>.this_text jvm.static_tag))
       ($_ <>.and
           <synthesis>.text
           (<text>.then jvm.visibility' <synthesis>.text)
@@ -383,7 +383,7 @@
 (def: abstract_method_synthesis
   (<synthesis>.Parser (jvm.Abstract_Method Synthesis))
   (<| <synthesis>.tuple
-      (<>.after (<synthesis>.text! jvm.abstract_tag))
+      (<>.after (<synthesis>.this_text jvm.abstract_tag))
       ($_ <>.and
           <synthesis>.text
           (<text>.then jvm.visibility' <synthesis>.text)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
index 16bd430fa..8a7f95cee 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/directive/lux.lux
@@ -274,7 +274,7 @@
 (def: (def::type_tagged expander host_analysis)
   (-> Expander /////analysis.Bundle Handler)
   (..custom
-   [($_ <>.and <code>.local_symbol <code>.any
+   [($_ <>.and <code>.local <code>.any
         (<>.or (<code>.variant (<>.some <code>.text))
                (<code>.tuple (<>.some <code>.text)))
         <code>.any)
@@ -366,7 +366,7 @@
 (def: def::alias
   Handler
   (..custom
-   [($_ <>.and <code>.local_symbol <code>.symbol)
+   [($_ <>.and <code>.local <code>.symbol)
     (function (_ extension_name phase archive [alias def_name])
       (do phase.monad
         [_ (///.lifted
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
index 93435b43b..91d72f959 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/jvm/host.lux
@@ -849,7 +849,7 @@
 (def: overriden_method_definition
   (Parser [(Environment Synthesis) (/.Overriden_Method Synthesis)])
   (<synthesis>.tuple (do <>.monad
-                       [_ (<synthesis>.text! /.overriden_tag)
+                       [_ (<synthesis>.this_text /.overriden_tag)
                         ownerT ..class
                         name <synthesis>.text
                         strict_fp? <synthesis>.bit
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
index 2f9e8476e..8579b8865 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
@@ -1,42 +1,42 @@
 (.using
-  [library
-   [lux {"-" Location}
-    ["[0]" meta]
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" function]
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" product]
-     ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" format}]
-      ["[0]" encoding]]
-     [collection
-      ["[0]" list ("[1]#[0]" functor monoid)]
-      ["[0]" sequence]]]
-    ["[0]" macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]]
-    [math
-     [number {"+" hex}
-      ["[0]" i64]]]
-    ["@" target
-     ["_" common_lisp {"+" Expression Computation Literal}]]]]
-  ["[0]" /// "_"
-   ["[1][0]" reference]
-   ["//[1]" /// "_"
-    [analysis {"+" Variant}]
-    ["[1][0]" synthesis {"+" Synthesis}]
-    ["[1][0]" generation]
-    ["//[1]" ///
-     ["[1][0]" phase]
-     [reference
-      [variable {"+" Register}]]
-     [meta
-      [archive {"+" Output Archive}
-       ["[0]" artifact {"+" Registry}]]]]]])
+ [library
+  [lux {"-" Location}
+   ["[0]" meta]
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" function]
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" product]
+    ["[0]" text ("[1]#[0]" hash)
+     ["%" format {"+" format}]
+     ["[0]" encoding]]
+    [collection
+     ["[0]" list ("[1]#[0]" functor monoid)]
+     ["[0]" sequence]]]
+   ["[0]" macro
+    [syntax {"+" syntax:}]
+    ["[0]" code]]
+   [math
+    [number {"+" hex}
+     ["[0]" i64]]]
+   ["@" target
+    ["_" common_lisp {"+" Expression Computation Literal}]]]]
+ ["[0]" /// "_"
+  ["[1][0]" reference]
+  ["//[1]" /// "_"
+   [analysis {"+" Variant}]
+   ["[1][0]" synthesis {"+" Synthesis}]
+   ["[1][0]" generation]
+   ["//[1]" ///
+    ["[1][0]" phase]
+    [reference
+     [variable {"+" Register}]]
+    [meta
+     [archive {"+" Output Archive}
+      ["[0]" artifact {"+" Registry}]]]]]])
 
 (def: module_id
   0)
@@ -87,31 +87,31 @@
   (-> (Expression Any) (Computation Any))
   (|>> [1 #1] ..variant))
 
-(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local))
                              body <code>.any])
   (do [! meta.monad]
     [ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
     (in (list (` (let [(~+ (|> vars
                                (list.zipped/2 ids)
                                (list#each (function (_ [id var])
-                                            (list (code.local_symbol var)
+                                            (list (code.local var)
                                                   (` (_.var (~ (code.text (format "v" (%.nat id)))))))))
                                list.together))]
                    (~ body)))))))
 
-(syntax: (runtime: [declaration (<>.or <code>.local_symbol
-                                       (<code>.form (<>.and <code>.local_symbol
-                                                            (<>.some <code>.local_symbol))))
+(syntax: (runtime: [declaration (<>.or <code>.local
+                                       (<code>.form (<>.and <code>.local
+                                                            (<>.some <code>.local))))
                     code <code>.any])
   (do meta.monad
     [runtime_id meta.seed]
     (macro.with_symbols [g!_]
-      (let [runtime (code.local_symbol (///reference.artifact [..module_id runtime_id]))
+      (let [runtime (code.local (///reference.artifact [..module_id runtime_id]))
             runtime_name (` (_.var (~ (code.text (%.code runtime)))))]
         (case declaration
           {.#Left name}
-          (let [g!name (code.local_symbol name)
-                code_nameC (code.local_symbol (format "@" name))]
+          (let [g!name (code.local name)
+                code_nameC (code.local (format "@" name))]
             (in (list (` (def: .public (~ g!name)
                            _.Var/1
                            (~ runtime_name)))
@@ -121,10 +121,10 @@
                            (_.defparameter (~ runtime_name) (~ code)))))))
           
           {.#Right [name inputs]}
-          (let [g!name (code.local_symbol name)
-                code_nameC (code.local_symbol (format "@" name))
+          (let [g!name (code.local name)
+                code_nameC (code.local (format "@" name))
                 
-                inputsC (list#each code.local_symbol inputs)
+                inputsC (list#each code.local inputs)
                 inputs_typesC (list#each (function.constant (` (_.Expression Any)))
                                          inputs)]
             (in (list (` (def: .public ((~ g!name) (~+ inputsC))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
index 7a28610fb..a260ec3c8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/extension.lux
@@ -32,12 +32,12 @@
 (type: .public (Variadic of) (-> (List of) of))
 
 (syntax: (arity: [arity <code>.nat
-                  name <code>.local_symbol
+                  name <code>.local
                   type <code>.any])
   (with_symbols [g!_ g!extension g!name g!phase g!archive g!inputs g!of g!anchor g!expression g!directive]
     (do [! meta.monad]
       [g!input+ (monad.all ! (list.repeated arity (macro.symbol "input")))]
-      (in (list (` (def: .public ((~ (code.local_symbol name)) (~ g!extension))
+      (in (list (` (def: .public ((~ (code.local name)) (~ g!extension))
                      (All ((~ g!_) (~ g!anchor) (~ g!expression) (~ g!directive))
                        (-> ((~ type) (~ g!expression))
                            (generation.Handler (~ g!anchor) (~ g!expression) (~ g!directive))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
index 26ac01808..06f2a1884 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
@@ -48,14 +48,14 @@
   (-> Var (List Expression) Statement [Statement Expression])
   (case inits
     {.#End}
-    [(_.function! @self (list) body!)
+    [(_.function_definition @self (list) body!)
      @self]
 
     _
-    [(_.function! @self
-                  (|> (list.enumeration inits)
-                      (list#each (|>> product.left ..capture)))
-                  (_.return (_.function @self (list) body!)))
+    [(_.function_definition @self
+                            (|> (list.enumeration inits)
+                                (list#each (|>> product.left ..capture)))
+                            (_.return (_.function @self (list) body!)))
      (_.apply/* @self inits)]))
 
 (def: @curried
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
index 2a53e6cf3..761a1c668 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
@@ -81,46 +81,46 @@
   (-> Var (-> Var Expression) Statement)
   (_.define name (definition name)))
 
-(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local))
                              body <code>.any])
   (do [! meta.monad]
     [ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
     (in (list (` (let [(~+ (|> vars
                                (list.zipped/2 ids)
                                (list#each (function (_ [id var])
-                                            (list (code.local_symbol var)
+                                            (list (code.local var)
                                                   (` (_.var (~ (code.text (format "v" (%.nat id)))))))))
                                list.together))]
                    (~ body)))))))
 
-(syntax: (runtime: [declaration (<>.or <code>.local_symbol
-                                       (<code>.form (<>.and <code>.local_symbol
-                                                            (<>.some <code>.local_symbol))))
+(syntax: (runtime: [declaration (<>.or <code>.local
+                                       (<code>.form (<>.and <code>.local
+                                                            (<>.some <code>.local))))
                     code <code>.any])
   (macro.with_symbols [g!_ runtime]
     (let [runtime_name (` (_.var (~ (code.text (%.code runtime)))))]
       (case declaration
         {.#Left name}
-        (let [g!name (code.local_symbol name)]
+        (let [g!name (code.local name)]
           (in (list (` (def: .public (~ g!name)
                          Var
                          (~ runtime_name)))
                     
-                    (` (def: (~ (code.local_symbol (format "@" name)))
+                    (` (def: (~ (code.local (format "@" name)))
                          Statement
                          (..feature (~ runtime_name)
                                     (function ((~ g!_) (~ g!name))
                                       (~ code))))))))
         
         {.#Right [name inputs]}
-        (let [g!name (code.local_symbol name)
-              inputsC (list#each code.local_symbol inputs)
+        (let [g!name (code.local name)
+              inputsC (list#each code.local inputs)
               inputs_typesC (list#each (function.constant (` _.Expression)) inputs)]
           (in (list (` (def: .public ((~ g!name) (~+ inputsC))
                          (-> (~+ inputs_typesC) Computation)
                          (_.apply/* (~ runtime_name) (list (~+ inputsC)))))
                     
-                    (` (def: (~ (code.local_symbol (format "@" name)))
+                    (` (def: (~ (code.local (format "@" name)))
                          Statement
                          (..feature (~ runtime_name)
                                     (function ((~ g!_) (~ g!_))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
index 6cf9f2ff0..99378b28c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
@@ -103,14 +103,14 @@
   (-> Var (-> Var Statement) Statement)
   (definition name))
 
-(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local))
                              body <code>.any])
   (do [! meta.monad]
     [ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
     (in (list (` (let [(~+ (|> vars
                                (list.zipped/2 ids)
                                (list#each (function (_ [id var])
-                                            (list (code.local_symbol var)
+                                            (list (code.local var)
                                                   (` (_.var (~ (code.text (format "v" (%.nat id)))))))))
                                list.together))]
                    (~ body)))))))
@@ -118,24 +118,24 @@
 (def: module_id
   0)
 
-(syntax: (runtime: [declaration (<>.or <code>.local_symbol
-                                       (<code>.form (<>.and <code>.local_symbol
-                                                            (<>.some <code>.local_symbol))))
+(syntax: (runtime: [declaration (<>.or <code>.local
+                                       (<code>.form (<>.and <code>.local
+                                                            (<>.some <code>.local))))
                     code <code>.any])
   (do meta.monad
     [runtime_id meta.seed]
     (macro.with_symbols [g!_]
-      (let [runtime (code.local_symbol (///reference.artifact [..module_id runtime_id]))
+      (let [runtime (code.local (///reference.artifact [..module_id runtime_id]))
             runtime_name (` (_.var (~ (code.text (%.code runtime)))))]
         (case declaration
           {.#Left name}
           (macro.with_symbols [g!_]
-            (let [g!name (code.local_symbol name)]
+            (let [g!name (code.local name)]
               (in (list (` (def: .public (~ g!name)
                              Var
                              (~ runtime_name)))
                         
-                        (` (def: (~ (code.local_symbol (format "@" name)))
+                        (` (def: (~ (code.local (format "@" name)))
                              Statement
                              (..feature (~ runtime_name)
                                         (function ((~ g!_) (~ g!name))
@@ -143,15 +143,15 @@
           
           {.#Right [name inputs]}
           (macro.with_symbols [g!_]
-            (let [g!name (code.local_symbol name)
-                  inputsC (list#each code.local_symbol inputs)
+            (let [g!name (code.local name)
+                  inputsC (list#each code.local inputs)
                   inputs_typesC (list#each (function.constant (` _.Expression))
                                            inputs)]
               (in (list (` (def: .public ((~ g!name) (~+ inputsC))
                              (-> (~+ inputs_typesC) Computation)
                              (_.apply (list (~+ inputsC)) (~ runtime_name))))
                         
-                        (` (def: (~ (code.local_symbol (format "@" name)))
+                        (` (def: (~ (code.local (format "@" name)))
                              Statement
                              (..feature (~ runtime_name)
                                         (function ((~ g!_) (~ g!_))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
index 10489ccc3..25bbcfe47 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
@@ -1,42 +1,42 @@
 (.using
-  [library
-   [lux {"-" Location}
-    ["[0]" meta]
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" function]
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" product]
-     ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" format}]
-      [encoding
-       ["[0]" utf8]]]
-     [collection
-      ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" sequence]]]
-    ["[0]" macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]]
-    [math
-     [number {"+" hex}
-      ["[0]" i64]]]
-    ["@" target
-     ["_" php {"+" Expression Label Constant Var Computation Literal Statement}]]]]
-  ["[0]" /// "_"
-   ["[1][0]" reference]
-   ["//[1]" /// "_"
-    ["[1][0]" synthesis {"+" Synthesis}]
-    ["[1][0]" generation]
-    ["//[1]" ///
-     ["[1][0]" phase]
-     [reference
-      [variable {"+" Register}]]
-     [meta
-      [archive {"+" Output Archive}
-       ["[0]" artifact {"+" Registry}]]]]]])
+ [library
+  [lux {"-" Location}
+   ["[0]" meta]
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" function]
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" product]
+    ["[0]" text ("[1]#[0]" hash)
+     ["%" format {"+" format}]
+     [encoding
+      ["[0]" utf8]]]
+    [collection
+     ["[0]" list ("[1]#[0]" functor)]
+     ["[0]" sequence]]]
+   ["[0]" macro
+    [syntax {"+" syntax:}]
+    ["[0]" code]]
+   [math
+    [number {"+" hex}
+     ["[0]" i64]]]
+   ["@" target
+    ["_" php {"+" Expression Label Constant Var Computation Literal Statement}]]]]
+ ["[0]" /// "_"
+  ["[1][0]" reference]
+  ["//[1]" /// "_"
+   ["[1][0]" synthesis {"+" Synthesis}]
+   ["[1][0]" generation]
+   ["//[1]" ///
+    ["[1][0]" phase]
+    [reference
+     [variable {"+" Register}]]
+    [meta
+     [archive {"+" Output Archive}
+      ["[0]" artifact {"+" Registry}]]]]]])
 
 (template [<name> <base>]
   [(type: .public <name>
@@ -70,14 +70,14 @@
   (-> Constant (-> Constant Statement) Statement)
   (definition name))
 
-(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local))
                              body <code>.any])
   (do [! meta.monad]
     [ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
     (in (list (` (let [(~+ (|> vars
                                (list.zipped/2 ids)
                                (list#each (function (_ [id var])
-                                            (list (code.local_symbol var)
+                                            (list (code.local var)
                                                   (` (_.var (~ (code.text (format "v" (%.nat id)))))))))
                                list.together))]
                    (~ body)))))))
@@ -85,24 +85,24 @@
 (def: module_id
   0)
 
-(syntax: (runtime: [declaration (<>.or <code>.local_symbol
-                                       (<code>.form (<>.and <code>.local_symbol
-                                                            (<>.some <code>.local_symbol))))
+(syntax: (runtime: [declaration (<>.or <code>.local
+                                       (<code>.form (<>.and <code>.local
+                                                            (<>.some <code>.local))))
                     code <code>.any])
   (do meta.monad
     [runtime_id meta.seed]
     (macro.with_symbols [g!_]
-      (let [runtime (code.local_symbol (///reference.artifact [..module_id runtime_id]))
+      (let [runtime (code.local (///reference.artifact [..module_id runtime_id]))
             runtime_name (` (_.constant (~ (code.text (%.code runtime)))))]
         (case declaration
           {.#Left name}
           (macro.with_symbols [g!_]
-            (let [g!name (code.local_symbol name)]
+            (let [g!name (code.local name)]
               (in (list (` (def: .public (~ g!name)
                              Var
                              (~ runtime_name)))
                         
-                        (` (def: (~ (code.local_symbol (format "@" name)))
+                        (` (def: (~ (code.local (format "@" name)))
                              Statement
                              (..feature (~ runtime_name)
                                         (function ((~ g!_) (~ g!name))
@@ -110,15 +110,15 @@
           
           {.#Right [name inputs]}
           (macro.with_symbols [g!_]
-            (let [g!name (code.local_symbol name)
-                  inputsC (list#each code.local_symbol inputs)
+            (let [g!name (code.local name)
+                  inputsC (list#each code.local inputs)
                   inputs_typesC (list#each (function.constant (` _.Expression))
                                            inputs)]
               (in (list (` (def: .public ((~ g!name) (~+ inputsC))
                              (-> (~+ inputs_typesC) Computation)
                              (_.apply/* (list (~+ inputsC)) (~ runtime_name))))
                         
-                        (` (def: (~ (code.local_symbol (format "@" name)))
+                        (` (def: (~ (code.local (format "@" name)))
                              Statement
                              (..feature (~ runtime_name)
                                         (function ((~ g!_) (~ g!_))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
index 13b55ccbd..a9e12aede 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
@@ -109,27 +109,27 @@
   (-> SVar (-> SVar (Statement Any)) (Statement Any))
   (definition name))
 
-(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local))
                              body <code>.any])
   (do [! meta.monad]
     [ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
     (in (list (` (let [(~+ (|> vars
                                (list.zipped/2 ids)
                                (list#each (function (_ [id var])
-                                            (list (code.local_symbol var)
+                                            (list (code.local var)
                                                   (` (_.var (~ (code.text (format "v" (%.nat id)))))))))
                                list.together))]
                    (~ body)))))))
 
-(syntax: (runtime: [declaration (<>.or <code>.local_symbol
-                                       (<code>.form (<>.and <code>.local_symbol
-                                                            (<>.some <code>.local_symbol))))
+(syntax: (runtime: [declaration (<>.or <code>.local
+                                       (<code>.form (<>.and <code>.local
+                                                            (<>.some <code>.local))))
                     code <code>.any])
   (case declaration
     {.#Left name}
     (macro.with_symbols [g!_]
-      (let [nameC (code.local_symbol name)
-            code_nameC (code.local_symbol (format "@" name))
+      (let [nameC (code.local name)
+            code_nameC (code.local (format "@" name))
             runtime_nameC (` (runtime_name (~ (code.text name))))]
         (in (list (` (def: .public (~ nameC) SVar (~ runtime_nameC)))
                   (` (def: (~ code_nameC)
@@ -140,10 +140,10 @@
     
     {.#Right [name inputs]}
     (macro.with_symbols [g!_]
-      (let [nameC (code.local_symbol name)
-            code_nameC (code.local_symbol (format "@" name))
+      (let [nameC (code.local name)
+            code_nameC (code.local (format "@" name))
             runtime_nameC (` (runtime_name (~ (code.text name))))
-            inputsC (list#each code.local_symbol inputs)
+            inputsC (list#each code.local inputs)
             inputs_typesC (list#each (function.constant (` (_.Expression Any)))
                                      inputs)]
         (in (list (` (def: .public ((~ nameC) (~+ inputsC))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
index e0800d768..5869ff984 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/procedure/common.lux
@@ -63,12 +63,12 @@
           "Expected: " (|> expected .int %i) "\n"
           "  Actual: " (|> actual .int %i)))
 
-(syntax: (arity: [name s.local_symbol
+(syntax: (arity: [name s.local
                   arity s.nat])
   (with_symbols [g!_ g!proc g!name g!translate g!inputs]
     (do [@ macro.monad]
       [g!input+ (monad.all @ (list.repeated arity (macro.symbol "input")))]
-      (in (list (` (def: .public ((~ (code.local_symbol name)) (~ g!proc))
+      (in (list (` (def: .public ((~ (code.local name)) (~ g!proc))
                      (-> (-> (..Vector (~ (code.nat arity)) Expression) Expression)
                          (-> Text ..Proc))
                      (function ((~ g!_) (~ g!name))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
index 6968c5618..02c38d130 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
@@ -76,48 +76,48 @@
         ... else
         (.int input)))
 
-(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local))
                              body <code>.any])
   (do [! meta.monad]
     [ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
     (in (list (` (let [(~+ (|> vars
                                (list.zipped/2 ids)
                                (list#each (function (_ [id var])
-                                            (list (code.local_symbol var)
+                                            (list (code.local var)
                                                   (` (_.var (~ (code.text (format "v" (%.nat id)))))))))
                                list.together))]
                    (~ body)))))))
 
-(syntax: (runtime: [declaration (<>.or <code>.local_symbol
-                                       (<code>.form (<>.and <code>.local_symbol
-                                                            (<>.some <code>.local_symbol))))
+(syntax: (runtime: [declaration (<>.or <code>.local
+                                       (<code>.form (<>.and <code>.local
+                                                            (<>.some <code>.local))))
                     code <code>.any])
   (do meta.monad
     [runtime_id meta.seed]
     (macro.with_symbols [g!_]
-      (let [runtime (code.local_symbol (///reference.artifact [..module_id runtime_id]))
+      (let [runtime (code.local (///reference.artifact [..module_id runtime_id]))
             runtime_name (` (_.var (~ (code.text (%.code runtime)))))]
         (case declaration
           {.#Left name}
-          (let [g!name (code.local_symbol name)]
+          (let [g!name (code.local name)]
             (in (list (` (def: .public (~ g!name)
                            _.SVar
                            (~ runtime_name)))
                       
-                      (` (def: (~ (code.local_symbol (format "@" name)))
+                      (` (def: (~ (code.local (format "@" name)))
                            _.Expression
                            (_.set! (~ runtime_name) (~ code)))))))
           
           {.#Right [name inputs]}
-          (let [g!name (code.local_symbol name)
-                inputsC (list#each code.local_symbol inputs)
+          (let [g!name (code.local name)
+                inputsC (list#each code.local inputs)
                 inputs_typesC (list#each (function.constant (` _.Expression))
                                          inputs)]
             (in (list (` (def: .public ((~ g!name) (~+ inputsC))
                            (-> (~+ inputs_typesC) _.Expression)
                            (_.apply (list (~+ inputsC)) (~ runtime_name))))
 
-                      (` (def: (~ (code.local_symbol (format "@" name)))
+                      (` (def: (~ (code.local (format "@" name)))
                            _.Expression
                            (..with_vars [(~+ inputsC)]
                              (_.set! (~ runtime_name)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
index 99a2784cb..94005f819 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
@@ -68,14 +68,14 @@
     ..unit
     _.nil))
 
-(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local))
                              body <code>.any])
   (do [! meta.monad]
     [ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
     (in (list (` (let [(~+ (|> vars
                                (list.zipped/2 ids)
                                (list#each (function (_ [id var])
-                                            (list (code.local_symbol var)
+                                            (list (code.local var)
                                                   (` (_.local (~ (code.text (format "v" (%.nat id)))))))))
                                list.together))]
                    (~ body)))))))
@@ -102,9 +102,9 @@
   ...     (_.do "const_defined?" (list (_.string "Encoding")) {.#None}))
   )
 
-(syntax: (runtime: [declaration (<>.or <code>.local_symbol
-                                       (<code>.form (<>.and <code>.local_symbol
-                                                            (<>.some <code>.local_symbol))))
+(syntax: (runtime: [declaration (<>.or <code>.local
+                                       (<code>.form (<>.and <code>.local
+                                                            (<>.some <code>.local))))
                     conditional_implementations (<>.some (<code>.tuple (<>.and <code>.any <code>.any)))
                     default_implementation <code>.any])
   (do meta.monad
@@ -113,11 +113,11 @@
       (case declaration
         {.#Left name}
         (macro.with_symbols [g!_]
-          (let [runtime (code.local_symbol (///reference.artifact [..module_id runtime_id]))
+          (let [runtime (code.local (///reference.artifact [..module_id runtime_id]))
                 runtime_name (` (_.constant (~ (code.text (%.code runtime)))))
-                g!name (code.local_symbol name)]
+                g!name (code.local name)]
             (in (list (` (def: .public (~ g!name) _.CVar (~ runtime_name)))
-                      (` (def: (~ (code.local_symbol (format "@" name)))
+                      (` (def: (~ (code.local (format "@" name)))
                            Statement
                            (~ (list#mix (function (_ [when then] else)
                                           (` (_.if (~ when)
@@ -128,10 +128,10 @@
         
         {.#Right [name inputs]}
         (macro.with_symbols [g!_]
-          (let [runtime (code.local_symbol (///reference.artifact [..module_id runtime_id]))
+          (let [runtime (code.local (///reference.artifact [..module_id runtime_id]))
                 runtime_name (` (_.local (~ (code.text (%.code runtime)))))
-                g!name (code.local_symbol name)
-                inputsC (list#each code.local_symbol inputs)
+                g!name (code.local name)
+                inputsC (list#each code.local inputs)
                 inputs_typesC (list#each (function.constant (` _.Expression))
                                          inputs)]
             (in (list (` (def: .public ((~ g!name) (~+ inputsC))
@@ -139,7 +139,7 @@
                            (_.apply/* (list (~+ inputsC)) {.#None}
                                       (~ runtime_name))))
                       
-                      (` (def: (~ (code.local_symbol (format "@" name)))
+                      (` (def: (~ (code.local (format "@" name)))
                            Statement
                            (..with_vars [(~+ inputsC)]
                              (~ (list#mix (function (_ [when then] else)
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
index b588619b7..062aa6c59 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/extension/common.lux
@@ -38,12 +38,12 @@
 (type: .public Trinary (-> (Vector 3 Expression) Computation))
 (type: .public Variadic (-> (List Expression) Computation))
 
-(syntax: (arity: [name <code>.local_symbol
+(syntax: (arity: [name <code>.local
                   arity <code>.nat])
   (with_symbols [g!_ g!extension g!name g!phase g!inputs]
     (do [! macro.monad]
       [g!input+ (monad.all ! (list.repeated arity (macro.symbol "input")))]
-      (in (list (` (def: .public ((~ (code.local_symbol name)) (~ g!extension))
+      (in (list (` (def: .public ((~ (code.local name)) (~ g!extension))
                      (-> (-> (..Vector (~ (code.nat arity)) Expression) Computation)
                          Handler)
                      (function ((~ g!_) (~ g!name) (~ g!phase) (~ g!inputs))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
index b13500596..bc785f38d 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
@@ -1,43 +1,43 @@
 (.using
-  [library
-   [lux {"-" Location}
-    ["[0]" meta]
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" function]
-     ["<>" parser
-      ["<[0]>" code]]]
-    [data
-     ["[0]" product]
-     ["[0]" text ("[1]#[0]" hash)
-      ["%" format {"+" format}]
-      [encoding
-       ["[0]" utf8]]]
-     [collection
-      ["[0]" list ("[1]#[0]" functor)]
-      ["[0]" sequence]]]
-    ["[0]" macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]]
-    [math
-     [number {"+" hex}
-      ["[0]" i64]]]
-    ["@" target
-     ["_" scheme {"+" Expression Computation Var}]]]]
-  ["[0]" /// "_"
-   ["[1][0]" reference]
-   ["//[1]" /// "_"
-    [analysis {"+" Variant}]
-    ["[1][0]" synthesis {"+" Synthesis}]
-    ["[1][0]" generation]
-    ["//[1]" ///
-     ["[1][0]" phase]
-     [reference
-      [variable {"+" Register}]]
-     [meta
-      [archive {"+" Output Archive}
-       ["[0]" artifact {"+" Registry}]]]]]])
+ [library
+  [lux {"-" Location}
+   ["[0]" meta]
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" function]
+    ["<>" parser
+     ["<[0]>" code]]]
+   [data
+    ["[0]" product]
+    ["[0]" text ("[1]#[0]" hash)
+     ["%" format {"+" format}]
+     [encoding
+      ["[0]" utf8]]]
+    [collection
+     ["[0]" list ("[1]#[0]" functor)]
+     ["[0]" sequence]]]
+   ["[0]" macro
+    [syntax {"+" syntax:}]
+    ["[0]" code]]
+   [math
+    [number {"+" hex}
+     ["[0]" i64]]]
+   ["@" target
+    ["_" scheme {"+" Expression Computation Var}]]]]
+ ["[0]" /// "_"
+  ["[1][0]" reference]
+  ["//[1]" /// "_"
+   [analysis {"+" Variant}]
+   ["[1][0]" synthesis {"+" Synthesis}]
+   ["[1][0]" generation]
+   ["//[1]" ///
+    ["[1][0]" phase]
+    [reference
+     [variable {"+" Register}]]
+    [meta
+     [archive {"+" Output Archive}
+      ["[0]" artifact {"+" Registry}]]]]]])
 
 (def: module_id
   0)
@@ -58,48 +58,48 @@
 (def: .public unit
   (_.string /////synthesis.unit))
 
-(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local_symbol))
+(syntax: .public (with_vars [vars (<code>.tuple (<>.some <code>.local))
                              body <code>.any])
   (do [! meta.monad]
     [ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
     (in (list (` (let [(~+ (|> vars
                                (list.zipped/2 ids)
                                (list#each (function (_ [id var])
-                                            (list (code.local_symbol var)
+                                            (list (code.local var)
                                                   (` (_.var (~ (code.text (format "v" (%.nat id)))))))))
                                list.together))]
                    (~ body)))))))
 
-(syntax: (runtime: [declaration (<>.or <code>.local_symbol
-                                       (<code>.form (<>.and <code>.local_symbol
-                                                            (<>.some <code>.local_symbol))))
+(syntax: (runtime: [declaration (<>.or <code>.local
+                                       (<code>.form (<>.and <code>.local
+                                                            (<>.some <code>.local))))
                     code <code>.any])
   (do meta.monad
     [runtime_id meta.seed]
     (macro.with_symbols [g!_]
-      (let [runtime (code.local_symbol (///reference.artifact [..module_id runtime_id]))
+      (let [runtime (code.local (///reference.artifact [..module_id runtime_id]))
             runtime_name (` (_.var (~ (code.text (%.code runtime)))))]
         (case declaration
           {.#Left name}
-          (let [g!name (code.local_symbol name)]
+          (let [g!name (code.local name)]
             (in (list (` (def: .public (~ g!name)
                            Var
                            (~ runtime_name)))
                       
-                      (` (def: (~ (code.local_symbol (format "@" name)))
+                      (` (def: (~ (code.local (format "@" name)))
                            _.Computation
                            (_.define_constant (~ runtime_name) (~ code)))))))
           
           {.#Right [name inputs]}
-          (let [g!name (code.local_symbol name)
-                inputsC (list#each code.local_symbol inputs)
+          (let [g!name (code.local name)
+                inputsC (list#each code.local inputs)
                 inputs_typesC (list#each (function.constant (` _.Expression))
                                          inputs)]
             (in (list (` (def: .public ((~ g!name) (~+ inputsC))
                            (-> (~+ inputs_typesC) _.Computation)
                            (_.apply/* (list (~+ inputsC)) (~ runtime_name))))
 
-                      (` (def: (~ (code.local_symbol (format "@" name)))
+                      (` (def: (~ (code.local (format "@" name)))
                            _.Computation
                            (..with_vars [(~+ inputsC)]
                              (_.define_function (~ runtime_name) [(list (~+ inputsC)) {.#None}]