Re-named "do-template" to "template".

47 files changed, 129 insertions, 129 deletions

diff --git a/new-luxc/source/luxc/lang/host/common-lisp.lux b/new-luxc/source/luxc/lang/host/common-lisp.lux
index 2acc52700..50a942636 100644
--- a/new-luxc/source/luxc/lang/host/common-lisp.lux
+++ b/new-luxc/source/luxc/lang/host/common-lisp.lux
@@ -102,7 +102,7 @@
     (-> Text Expression)
     (|>> %t :abstraction))
 
-  (do-template [<name> <prefix>]
+  (template [<name> <prefix>]
     [(def: #export <name>
        (-> Text Expression)
        (|>> (format <prefix>) :abstraction))]
@@ -127,7 +127,7 @@
     (-> Expression (List Expression) Expression)
     (form (#.Cons func args)))
   
-  (do-template [<name> <function>]
+  (template [<name> <function>]
     [(def: #export <name>
        (-> (List Expression) Expression)
        ($apply (..global <function>)))]
@@ -156,7 +156,7 @@
     (-> Expression (-> Expression Expression))
     (|>> (.list) (..$apply func)))
 
-  (do-template [<lux-name> <scheme-name>]
+  (template [<lux-name> <scheme-name>]
     [(def: #export <lux-name> (..$apply1 (..global <scheme-name>)))]
 
     [length "length"]
@@ -204,7 +204,7 @@
     (.function (_ _0 _1)
       (..$apply func (.list _0 _1))))
 
-  (do-template [<lux-name> <scheme-name>]
+  (template [<lux-name> <scheme-name>]
     [(def: #export <lux-name> (..$apply2 (..global <scheme-name>)))]
 
     [append "append"]
@@ -224,7 +224,7 @@
     (.function (_ _0 _1 _2)
       (..$apply func (.list _0 _1 _2))))
 
-  (do-template [<lux-name> <scheme-name>]
+  (template [<lux-name> <scheme-name>]
     [(def: #export <lux-name> ($apply3 (..global <scheme-name>)))]
 
     [subseq/3 "subseq"]
@@ -237,7 +237,7 @@
     (-> Expression Expression Expression)
     (concatenate/3 (..symbol "string")))
 
-  (do-template [<lux-name> <scheme-name>]
+  (template [<lux-name> <scheme-name>]
     [(def: #export <lux-name>
        (-> (List Expression) Expression)
        (|>> (.list& (..global <scheme-name>)) ..form))]
@@ -246,7 +246,7 @@
     [and "and"]
     )
 
-  (do-template [<lux-name> <scheme-name>]
+  (template [<lux-name> <scheme-name>]
     [(def: #export (<lux-name> param subject)
        (-> Expression Expression Expression)
        (..form (.list (..global <scheme-name>) subject param)))]
@@ -273,7 +273,7 @@
     [logxor "logxor"]
     )
 
-  (do-template [<lux-name> <scheme-name>]
+  (template [<lux-name> <scheme-name>]
     [(def: #export (<lux-name> bindings body)
        (-> (List [SVar Expression]) Expression Expression)
        (..form (.list (..global <scheme-name>)
@@ -342,7 +342,7 @@
                                                handler)))
                               handlers))))
 
-  (do-template [<name> <prefix>]
+  (template [<name> <prefix>]
     [(def: #export (<name> conditions expression)
        (-> (List Text) Expression Expression)
        (case conditions
diff --git a/new-luxc/source/luxc/lang/host/jvm.lux b/new-luxc/source/luxc/lang/host/jvm.lux
index 32a24452d..71e887d4d 100644
--- a/new-luxc/source/luxc/lang/host/jvm.lux
+++ b/new-luxc/source/luxc/lang/host/jvm.lux
@@ -96,7 +96,7 @@
 (type: #export Host
   (translation.Host Inst Definition))
 
-(do-template [<name> <base>]
+(template [<name> <base>]
   [(type: #export <name>
      (<base> ..Anchor Inst Definition))]
 
diff --git a/new-luxc/source/luxc/lang/host/jvm/def.lux b/new-luxc/source/luxc/lang/host/jvm/def.lux
index db6bfe07b..f9b6e5c2d 100644
--- a/new-luxc/source/luxc/lang/host/jvm/def.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/def.lux
@@ -154,7 +154,7 @@
       ## (ClassWriter::COMPUTE_FRAMES)
       ))
 
-(do-template [<name> <flag>]
+(template [<name> <flag>]
   [(def: #export (<name> version visibility config name parameters super interfaces
                          definitions)
      (-> $.Version $.Visibility $.Class-Config Text (List $.Parameter) $.Class (List $.Class) $.Def
@@ -251,7 +251,7 @@
                    (FieldVisitor::visitEnd))]
       writer)))
 
-(do-template [<name> <lux-type> <jvm-type> <prepare>]
+(template [<name> <lux-type> <jvm-type> <prepare>]
   [(def: #export (<name> visibility config name value)
      (-> $.Visibility $.Field-Config Text <lux-type> $.Def)
      (function (_ writer)
diff --git a/new-luxc/source/luxc/lang/host/jvm/inst.lux b/new-luxc/source/luxc/lang/host/jvm/inst.lux
index 5311f39d9..36a020686 100644
--- a/new-luxc/source/luxc/lang/host/jvm/inst.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/inst.lux
@@ -127,7 +127,7 @@
   (-> (-> Label Inst) Inst)
   (action (Label::new)))
 
-(do-template [<name> <type> <prepare>]
+(template [<name> <type> <prepare>]
   [(def: #export (<name> value)
      (-> <type> Inst)
      (function (_ visitor)
@@ -151,7 +151,7 @@
     (do-to visitor
       (MethodVisitor::visitInsn (prefix ACONST_NULL)))))
 
-(do-template [<name>]
+(template [<name>]
   [(def: #export <name>
      Inst
      (function (_ visitor)
@@ -212,7 +212,7 @@
   [RETURN] [IRETURN] [LRETURN] [DRETURN] [ARETURN]
   )
 
-(do-template [<name>]
+(template [<name>]
   [(def: #export (<name> register)
      (-> Nat Inst)
      (function (_ visitor)
@@ -223,7 +223,7 @@
   [ISTORE] [LSTORE] [ASTORE]
   )
 
-(do-template [<name> <inst>]
+(template [<name> <inst>]
   [(def: #export (<name> class field type)
      (-> Text Text //.Type Inst)
      (function (_ visitor)
@@ -237,7 +237,7 @@
   [GETFIELD  Opcodes::GETFIELD]
   )
 
-(do-template [<name> <inst>]
+(template [<name> <inst>]
   [(def: #export (<name> class)
      (-> Text Inst)
      (function (_ visitor)
@@ -265,7 +265,7 @@
                                      #//.Double  (Opcodes::T_DOUBLE)
                                      #//.Char    (Opcodes::T_CHAR))))))
 
-(do-template [<name> <inst>]
+(template [<name> <inst>]
   [(def: #export (<name> class method-name method-signature interface?)
      (-> Text Text //.Method Bit Inst)
      (function (_ visitor)
@@ -278,7 +278,7 @@
   [INVOKEINTERFACE Opcodes::INVOKEINTERFACE]
   )
 
-(do-template [<name>]
+(template [<name>]
   [(def: #export (<name> @where)
      (-> //.Label Inst)
      (function (_ visitor)
diff --git a/new-luxc/source/luxc/lang/host/jvm/type.lux b/new-luxc/source/luxc/lang/host/jvm/type.lux
index 523944b44..72a1925b4 100644
--- a/new-luxc/source/luxc/lang/host/jvm/type.lux
+++ b/new-luxc/source/luxc/lang/host/jvm/type.lux
@@ -8,7 +8,7 @@
   ["." //])
 
 ## Types
-(do-template [<name> <primitive>]
+(template [<name> <primitive>]
   [(def: #export <name> //.Type (#//.Primitive <primitive>))]
 
   [boolean #//.Boolean]
diff --git a/new-luxc/source/luxc/lang/host/lua.lux b/new-luxc/source/luxc/lang/host/lua.lux
index ec2fa8928..364c05052 100644
--- a/new-luxc/source/luxc/lang/host/lua.lux
+++ b/new-luxc/source/luxc/lang/host/lua.lux
@@ -144,7 +144,7 @@
               (text.join-with ", "))
           "}"))
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: #export (<name> param subject)
      (-> Expression Expression Expression)
      (format "(" subject " " <op> " " param ")"))]
@@ -162,7 +162,7 @@
   [%       "%"]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: #export (<name> param subject)
      (-> Expression Expression Expression)
      (format "(" param " " <op> " " subject ")"))]
@@ -174,7 +174,7 @@
   [bit-xor "~"]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: #export (<name> param subject)
      (-> Expression Expression Expression)
      (format "(" subject " " <op> " " param ")"))]
diff --git a/new-luxc/source/luxc/lang/host/php.lux b/new-luxc/source/luxc/lang/host/php.lux
index 6ab97ee52..878bbaa18 100644
--- a/new-luxc/source/luxc/lang/host/php.lux
+++ b/new-luxc/source/luxc/lang/host/php.lux
@@ -56,7 +56,7 @@
          (text.join-with ", ")
          (text.enclose ["(" ")"])))
 
-  (do-template [<name> <reference?>]
+  (template [<name> <reference?>]
     [(def: #export <name>
        (-> Var Argument)
        (|>> [<reference?>]))]
@@ -127,7 +127,7 @@
                " " uses " "
                (block (:representation body))))))
 
-  (do-template [<name> <function>]
+  (template [<name> <function>]
     [(def: #export <name>
        Computation
        (..apply (list) (..global <function>)))]
@@ -136,7 +136,7 @@
     [func-get-args/0 "func_get_args"]
     )
 
-  (do-template [<name> <function>]
+  (template [<name> <function>]
     [(def: #export (<name> values)
        (-> (List Expression) Computation)
        (..apply values (..global <function>)))]
@@ -144,7 +144,7 @@
     [array/* "array"]
     )
 
-  (do-template [<name> <function>]
+  (template [<name> <function>]
     [(def: #export (<name> required optionals)
        (-> Expression (List Expression) Computation)
        (..apply (list& required optionals) (..global <function>)))]
@@ -162,7 +162,7 @@
                  (text.join-with ", "))
              ")")))
 
-  (do-template [<name> <function>]
+  (template [<name> <function>]
     [(def: #export (<name> input0)
        (-> Expression Computation)
        (..apply (list input0) (..global <function>)))]
@@ -174,7 +174,7 @@
     [floatval/1 "floatval"]
     )
 
-  (do-template [<name> <function>]
+  (template [<name> <function>]
     [(def: #export (<name> input0 input1)
        (-> Expression Expression Computation)
        (..apply (list input0 input1) (..global <function>)))]
@@ -184,7 +184,7 @@
     [array-push/2           "array_push"]
     )
 
-  (do-template [<name> <function>]
+  (template [<name> <function>]
     [(def: #export (<name> input0 input1 input2)
        (-> Expression Expression Expression Computation)
        (..apply (list input0 input1 input2) (..global <function>)))]
@@ -213,7 +213,7 @@
              (:representation then) " : "
              (:representation else))))
 
-  (do-template [<name> <op>]
+  (template [<name> <op>]
     [(def: #export (<name> param subject)
        (-> Expression Expression Computation)
        (computation
@@ -244,7 +244,7 @@
     (-> Computation Computation)
     (|>> :representation (format "!") :abstraction))
 
-  (do-template [<name> <type> <constructor>]
+  (template [<name> <type> <constructor>]
     [(def: #export (<name> var value)
        (-> Var Expression <type>)
        (<constructor> (format (:representation var) " = " (:representation value))))]
@@ -317,7 +317,7 @@
      (format "try " (block (:representation body!)) "\n"
              (|> excepts (list/map catch!) (text.join-with "\n")))))
 
-  (do-template [<name> <keyword>]
+  (template [<name> <keyword>]
     [(def: #export (<name> message)
        (-> Expression Statement)
        (statement (format <keyword> " " (:representation message))))]
diff --git a/new-luxc/source/luxc/lang/host/r.lux b/new-luxc/source/luxc/lang/host/r.lux
index 8cd802df9..6e4c7fb5b 100644
--- a/new-luxc/source/luxc/lang/host/r.lux
+++ b/new-luxc/source/luxc/lang/host/r.lux
@@ -109,7 +109,7 @@
     (composite-literal "list(" ")" (.function (_ [key value])
                                      (format key "=" (:representation value)))))
   
-  (do-template [<name> <function>]
+  (template [<name> <function>]
     [(def: #export <name>
        (-> (List Expression) Expression)
        (composite-literal (format <function> "(") ")" expression))]
@@ -172,7 +172,7 @@
                else
                (list.reverse clauses)))
 
-  (do-template [<name> <op>]
+  (template [<name> <op>]
     [(def: #export (<name> param subject)
        (-> Expression Expression Expression)
        (self-contained
@@ -203,7 +203,7 @@
     (-> Text Expression)
     (|>> var @@))
 
-  (do-template [<name> <func>]
+  (template [<name> <func>]
     [(def: #export (<name> param subject)
        (-> Expression Expression Expression)
        (..apply (.list subject param) (..global <func>)))]
@@ -219,7 +219,7 @@
     (-> Expression Expression)
     (..apply (.list subject) (..global "bitwNot")))
 
-  (do-template [<name> <op>]
+  (template [<name> <op>]
     [(def: #export <name>
        (-> Expression Expression)
        (|>> :representation (format <op>) self-contained))]
@@ -271,7 +271,7 @@
      (format "for (" (..name var) " in " (..expression inputs) ")"
              (.._block (:representation body)))))
 
-  (do-template [<name> <keyword>]
+  (template [<name> <keyword>]
     [(def: #export (<name> message)
        (-> Expression Expression)
        (..apply (.list message) (..global <keyword>)))]
diff --git a/new-luxc/source/luxc/lang/host/ruby.lux b/new-luxc/source/luxc/lang/host/ruby.lux
index 61e945af0..61c0f8bb5 100644
--- a/new-luxc/source/luxc/lang/host/ruby.lux
+++ b/new-luxc/source/luxc/lang/host/ruby.lux
@@ -179,7 +179,7 @@
       (#.Some name)
       (format "(" name " = " proc ")"))))
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: #export (<name> param subject)
      (-> Expression Expression Expression)
      (format "(" subject " " <op> " " param ")"))]
@@ -197,7 +197,7 @@
   [pow     "**"]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: #export (<name> param subject)
      (-> Expression Expression Expression)
      (format "(" param " " <op> " " subject ")"))]
@@ -209,7 +209,7 @@
   [bit-xor "^"]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: #export (<name> param subject)
      (-> Expression Expression Expression)
      (format "(" subject " " <op> " " param ")"))]
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp.lux b/new-luxc/source/luxc/lang/translation/common-lisp.lux
index 360a230f9..a9ea2c215 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp.lux
@@ -18,7 +18,7 @@
               (host ["_" common-lisp #+ Expression]))
         [".C" io]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
@@ -162,7 +162,7 @@
   (function (_ compiler)
     (#e.Success [compiler (|> compiler (get@ #.host) (:coerce Host) (get@ #program-buffer))])))
 
-(do-template [<name> <field> <outputT>]
+(template [<name> <field> <outputT>]
   [(def: (<name> code)
      (-> Expression (Meta <outputT>))
      (function (_ compiler)
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
index 54b77e60d..9f918bdd5 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/eval.jvm.lux
@@ -32,7 +32,7 @@
     (#e.Error error)
     (log! error)))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
index 45887cdae..437648fbb 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/expression.jvm.lux
@@ -21,7 +21,7 @@
       [".T" case]
       [".T" procedure]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
index b140a11eb..3eaa60821 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/common.jvm.lux
@@ -142,7 +142,7 @@
       ))
 
 ## [[Bits]]
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -182,7 +182,7 @@
   (#static MIN_VALUE Double)
   (#static MAX_VALUE Double))
 
-(do-template [<name> <const> <encode>]
+(template [<name> <const> <encode>]
   [(def: (<name> _)
      Nullary
      (<encode> <const>))]
@@ -192,7 +192,7 @@
   [frac//max      Double::MAX_VALUE            _.double]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (|> subjectO (<op> paramO)))]
@@ -206,7 +206,7 @@
   [int//< _.<]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/host.jvm.lux
index af82491b6..2793b40e8 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/procedure/host.jvm.lux
@@ -14,7 +14,7 @@
   (/// [".T" runtime])
   (// ["@" common]))
 
-## (do-template [<name> <lua>]
+## (template [<name> <lua>]
 ##   [(def: (<name> _) @.Nullary <lua>)]
 
 ##   [lua//nil      "nil"]
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux
index 6d2a491c6..def77fc35 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/reference.jvm.lux
@@ -9,7 +9,7 @@
   [//]
   (// [".T" runtime]))
 
-(do-template [<register> <translation> <prefix>]
+(template [<register> <translation> <prefix>]
   [(def: #export (<register> register)
      (-> Register SVar)
      (_.var (format <prefix> (%i (.int register)))))
diff --git a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
index 1f06130e4..5fa6179c7 100644
--- a/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/common-lisp/runtime.jvm.lux
@@ -206,7 +206,7 @@
   Runtime
   (_.progn (list @@bit//logical-right-shift)))
 
-(do-template [<name> <top-cmp>]
+(template [<name> <top-cmp>]
   [(def: (<name> top value)
      (-> Expression Expression Expression)
      (_.and (list (|> value (_.>= (_.int 0)))
diff --git a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
index 628edff49..e514fe28a 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/primitive.jvm.lux
@@ -21,7 +21,7 @@
                                (if value "TRUE" "FALSE")
                                ($t.class "java.lang.Boolean" (list)))))
 
-(do-template [<name> <type> <load> <wrap>]
+(template [<name> <type> <load> <wrap>]
   [(def: #export (<name> value)
      (-> <type> (Operation Inst))
      (let [loadI (|> value <load>)]
diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
index 55cf8a644..faec813e9 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/common.jvm.lux
@@ -118,7 +118,7 @@
                        #0)))
 
 ### Bits
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [maskI inputI])
      Binary
      (|>> inputI (_.unwrap #$.Long)
@@ -130,7 +130,7 @@
   [bit::xor _.LXOR]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [shiftI inputI])
      Binary
      (|>> inputI (_.unwrap #$.Long)
@@ -144,7 +144,7 @@
   )
 
 ### Numbers
-(do-template [<name> <const> <type>]
+(template [<name> <const> <type>]
   [(def: (<name> _)
      Nullary
      (|>> <const> (_.wrap <type>)))]
@@ -154,7 +154,7 @@
   [frac::max      (_.double (Double::MAX_VALUE))            #$.Double]
   )
 
-(do-template [<name> <type> <op>]
+(template [<name> <type> <op>]
   [(def: (<name> [subjectI paramI])
      Binary
      (|>> subjectI (_.unwrap <type>)
@@ -175,8 +175,8 @@
   [frac::% #$.Double _.DREM]
   )
 
-(do-template [<eq> <lt> <unwrap> <cmp>]
-  [(do-template [<name> <reference>]
+(template [<eq> <lt> <unwrap> <cmp>]
+  [(template [<name> <reference>]
      [(def: (<name> [subjectI paramI])
         Binary
         (|>> subjectI <unwrap>
@@ -192,7 +192,7 @@
   [frac::= frac::< (_.unwrap #$.Double) _.DCMPG]
   )
 
-(do-template [<name> <prepare> <transform>]
+(template [<name> <prepare> <transform>]
   [(def: (<name> inputI)
      Unary
      (|>> inputI <prepare> <transform>))]
@@ -216,7 +216,7 @@
        (_.INVOKEVIRTUAL "java.lang.String" "length" (_t.method (list) (#.Some _t.int) (list)) #0)
        lux-intI))
 
-(do-template [<name> <pre-subject> <pre-param> <op> <post>]
+(template [<name> <pre-subject> <pre-param> <op> <post>]
   [(def: (<name> [subjectI paramI])
      Binary
      (|>> subjectI <pre-subject>
@@ -237,7 +237,7 @@
    lux-intI]
   )
 
-(do-template [<name> <pre-subject> <pre-param> <pre-extra> <op>]
+(template [<name> <pre-subject> <pre-param> <pre-extra> <op>]
   [(def: (<name> [subjectI paramI extraI])
      Trinary
      (|>> subjectI <pre-subject>
diff --git a/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux
index 483f810e2..624af7ed8 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/procedure/host.jvm.lux
@@ -25,7 +25,7 @@
               ["ls" synthesis]))
   (// ["@" common]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
@@ -33,7 +33,7 @@
   [Invalid-Syntax-For-Argument-Generation]
   )
 
-(do-template [<name> <inst>]
+(template [<name> <inst>]
   [(def: <name>
      $.Inst
      <inst>)]
@@ -43,7 +43,7 @@
   [L2C (|>> _.L2I _.I2C)]
   )
 
-(do-template [<name> <unwrap> <conversion> <wrap>]
+(template [<name> <unwrap> <conversion> <wrap>]
   [(def: (<name> inputI)
      @.Unary
      (if (is? _.NOP <conversion>)
@@ -111,7 +111,7 @@
           (@.install "short-to-long" (@.unary convert//short-to-long))
           )))
 
-(do-template [<name> <op> <unwrapX> <unwrapY> <wrap>]
+(template [<name> <op> <unwrapX> <unwrapY> <wrap>]
   [(def: (<name> [xI yI])
      @.Binary
      (|>> xI (_.unwrap <unwrapX>)
@@ -159,7 +159,7 @@
 (def: falseI (_.GETSTATIC "java.lang.Boolean" "FALSE" boolean-class))
 (def: trueI (_.GETSTATIC "java.lang.Boolean" "TRUE" boolean-class))
 
-(do-template [<name> <op> <unwrapX> <unwrapY> <wrap>]
+(template [<name> <op> <unwrapX> <unwrapY> <wrap>]
   [(def: (<name> [xI yI])
      @.Binary
      (<| _.with-label (function (_ @then))
@@ -180,7 +180,7 @@
   [char//< _.IF_ICMPLT #$.Char #$.Char #$.Boolean]
   )
 
-(do-template [<name> <op> <reference> <unwrapX> <unwrapY> <wrap>]
+(template [<name> <op> <reference> <unwrapX> <unwrapY> <wrap>]
   [(def: (<name> [xI yI])
      @.Binary
      (<| _.with-label (function (_ @then))
@@ -684,7 +684,7 @@
     _
     (&.throw @.Wrong-Syntax (@.wrong-syntax proc inputs))))
 
-(do-template [<name> <invoke> <interface?>]
+(template [<name> <invoke> <interface?>]
   [(def: (<name> proc translate inputs)
      (-> Text @.Proc)
      (case inputs
diff --git a/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux
index fe4a58b36..0a354a929 100644
--- a/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/jvm/reference.jvm.lux
@@ -19,7 +19,7 @@
       ["_" inst]]]]]
   ["." //])
 
-(do-template [<name> <prefix>]
+(template [<name> <prefix>]
   [(def: #export (<name> idx)
      (-> Nat Text)
      (|> idx %n (format <prefix>)))]
diff --git a/new-luxc/source/luxc/lang/translation/lua.lux b/new-luxc/source/luxc/lang/translation/lua.lux
index e5272a3ea..e79af1048 100644
--- a/new-luxc/source/luxc/lang/translation/lua.lux
+++ b/new-luxc/source/luxc/lang/translation/lua.lux
@@ -18,7 +18,7 @@
               (host [lua #+ Lua Expression Statement]))
         [".C" io]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux
index 18ae10e0a..17596ffa7 100644
--- a/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/eval.jvm.lux
@@ -11,7 +11,7 @@
         (lang (host [lua #+ Lua Expression Statement])))
   [//])
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
index 5d6b073fc..6597364bb 100644
--- a/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/expression.jvm.lux
@@ -22,7 +22,7 @@
       [".T" case]
       [".T" procedure]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux
index 94337001e..2f1b652e3 100644
--- a/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/procedure/common.jvm.lux
@@ -135,7 +135,7 @@
       (loopT.translate-recur translate inputsS))))
 
 ## [[Bits]]
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -145,7 +145,7 @@
   [bit//xor lua.bit-xor]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -163,7 +163,7 @@
   (#static POSITIVE_INFINITY Double)
   (#static NEGATIVE_INFINITY Double))
 
-(do-template [<name> <const> <encode>]
+(template [<name> <const> <encode>]
   [(def: (<name> _)
      Nullary
      (<encode> <const>))]
@@ -173,7 +173,7 @@
   [frac//max               Double::MAX_VALUE            lua.float]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -185,7 +185,7 @@
   [int//rem        lua.%]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -202,7 +202,7 @@
   [text//<   lua.<]
   )
 
-(do-template [<name> <cmp>]
+(template [<name> <cmp>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<cmp> paramO subjectO))]
@@ -220,7 +220,7 @@
   (lux//try (lua.function (list)
               (lua.return! (lua.apply "tonumber" (list inputO))))))
 
-(do-template [<name> <divisor>]
+(template [<name> <divisor>]
   [(def: (<name> inputO)
      Unary
      (lua./ <divisor> inputO))]
@@ -228,7 +228,7 @@
   [int//to-frac (lua.float 1.0)]
   )
 
-(do-template [<name> <transform>]
+(template [<name> <transform>]
   [(def: (<name> inputO)
      Unary
      (|> inputO <transform>))]
@@ -241,7 +241,7 @@
   (|>> (list) (lua.apply "string.char")))
 
 ## [[Text]]
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: <name>
      Unary
      (|>> (list) (lua.apply <op>)))]
@@ -257,7 +257,7 @@
   Binary
   (runtimeT.text//char subjectO paramO))
 
-(do-template [<name> <runtime>]
+(template [<name> <runtime>]
   [(def: (<name> [subjectO paramO extraO])
      Trinary
      (<runtime> subjectO paramO extraO))]
diff --git a/new-luxc/source/luxc/lang/translation/lua/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/procedure/host.jvm.lux
index 2271d354a..f53f3ba05 100644
--- a/new-luxc/source/luxc/lang/translation/lua/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/procedure/host.jvm.lux
@@ -14,7 +14,7 @@
   (/// [".T" runtime])
   (// ["@" common]))
 
-(do-template [<name> <lua>]
+(template [<name> <lua>]
   [(def: (<name> _) @.Nullary <lua>)]
 
   [lua//nil      "nil"]
diff --git a/new-luxc/source/luxc/lang/translation/lua/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/lua/reference.jvm.lux
index fac6308a0..ea3f8e604 100644
--- a/new-luxc/source/luxc/lang/translation/lua/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/lua/reference.jvm.lux
@@ -9,7 +9,7 @@
   [//]
   (// [".T" runtime]))
 
-(do-template [<register> <translation> <prefix>]
+(template [<register> <translation> <prefix>]
   [(def: #export (<register> register)
      (-> Register Expression)
      (format <prefix> (%i (.int register))))
diff --git a/new-luxc/source/luxc/lang/translation/php.lux b/new-luxc/source/luxc/lang/translation/php.lux
index db0eeced4..0a694d3e6 100644
--- a/new-luxc/source/luxc/lang/translation/php.lux
+++ b/new-luxc/source/luxc/lang/translation/php.lux
@@ -19,7 +19,7 @@
               (host ["_" php #+ Expression Statement]))
         [".C" io]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
@@ -159,7 +159,7 @@
   (function (_ compiler)
     (#e.Success [compiler (|> compiler (get@ #.host) (:coerce Host) (get@ #program-buffer))])))
 
-(do-template [<name> <field> <inputT> <outputT>]
+(template [<name> <field> <inputT> <outputT>]
   [(def: (<name> code)
      (-> <inputT> (Meta <outputT>))
      (function (_ compiler)
diff --git a/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux
index 3bfd5578a..4c4a6c641 100644
--- a/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/eval.jvm.lux
@@ -12,7 +12,7 @@
         (lang (host ["_" php #+ Expression Statement])))
   [//])
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux
index 3d7d652bf..c49003c64 100644
--- a/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/expression.jvm.lux
@@ -22,7 +22,7 @@
       [".T" procedure]
       ))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
index f77a35292..7a44accf2 100644
--- a/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/procedure/common.jvm.lux
@@ -146,7 +146,7 @@
 ##       ))
 
 ## ## [[Bits]]
-## (do-template [<name> <op>]
+## (template [<name> <op>]
 ##   [(def: (<name> [subjectO paramO])
 ##      Binary
 ##      (<op> paramO subjectO))]
@@ -161,7 +161,7 @@
 ##   (|> (_.bit-shl paramO subjectO)
 ##       runtimeT.bit//64))
 
-## (do-template [<name> <op>]
+## (template [<name> <op>]
 ##   [(def: (<name> [subjectO paramO])
 ##      Binary
 ##      (<op> paramO subjectO))]
@@ -187,7 +187,7 @@
 ##   (#static MIN_VALUE Double)
 ##   (#static MAX_VALUE Double))
 
-## (do-template [<name> <const> <encode>]
+## (template [<name> <const> <encode>]
 ##   [(def: (<name> _)
 ##      Nullary
 ##      (<encode> <const>))]
@@ -197,7 +197,7 @@
 ##   [frac//max               Double::MAX_VALUE            _.float]
 ##   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (|> subjectO
@@ -210,7 +210,7 @@
   [int//%        _.%]
   )
 
-## (do-template [<name> <op>]
+## (template [<name> <op>]
 ##   [(def: (<name> [subjectO paramO])
 ##      Binary
 ##      (<op> paramO subjectO))]
@@ -227,7 +227,7 @@
 ##   [text//<   _.<]
 ##   )
 
-(do-template [<name> <cmp>]
+(template [<name> <cmp>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<cmp> paramO subjectO))]
diff --git a/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux
index af82491b6..2793b40e8 100644
--- a/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/procedure/host.jvm.lux
@@ -14,7 +14,7 @@
   (/// [".T" runtime])
   (// ["@" common]))
 
-## (do-template [<name> <lua>]
+## (template [<name> <lua>]
 ##   [(def: (<name> _) @.Nullary <lua>)]
 
 ##   [lua//nil      "nil"]
diff --git a/new-luxc/source/luxc/lang/translation/php/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/php/reference.jvm.lux
index 833fc5e5a..2415963d1 100644
--- a/new-luxc/source/luxc/lang/translation/php/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/reference.jvm.lux
@@ -9,7 +9,7 @@
   [//]
   (// [".T" runtime]))
 
-(do-template [<register> <prefix>]
+(template [<register> <prefix>]
   [(def: #export <register>
      (-> Register Var)
      (|>> (:coerce Int) %i (format <prefix>) _.var))]
@@ -27,7 +27,7 @@
   (-> Name Var)
   (|>> //.definition-name _.var))
 
-(do-template [<name> <input> <converter>]
+(template [<name> <input> <converter>]
   [(def: #export <name>
      (-> <input> (Meta Var))
      (|>> <converter> (:: macro.Monad<Meta> wrap)))]
diff --git a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
index 3d5ea1775..7c4d9f444 100644
--- a/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/php/runtime.jvm.lux
@@ -239,7 +239,7 @@
 
 ## (def: inc (|>> (_.+ (_.int 1))))
 
-## (do-template [<name> <top-cmp>]
+## (template [<name> <top-cmp>]
 ##   [(def: (<name> top value)
 ##      (-> Expression Expression Expression)
 ##      (_.and (|> value (_.>= (_.int 0)))
diff --git a/new-luxc/source/luxc/lang/translation/r.lux b/new-luxc/source/luxc/lang/translation/r.lux
index a013bfd1c..d5a9f35fa 100644
--- a/new-luxc/source/luxc/lang/translation/r.lux
+++ b/new-luxc/source/luxc/lang/translation/r.lux
@@ -18,7 +18,7 @@
               (host [r #+ Expression]))
         [".C" io]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
@@ -161,7 +161,7 @@
   (function (_ compiler)
     (#e.Success [compiler (|> compiler (get@ #.host) (:coerce Host) (get@ #program-buffer))])))
 
-(do-template [<name> <field> <outputT>]
+(template [<name> <field> <outputT>]
   [(def: (<name> code)
      (-> Expression (Meta <outputT>))
      (function (_ compiler)
diff --git a/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux
index d838bc332..3c41fbe63 100644
--- a/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/expression.jvm.lux
@@ -22,7 +22,7 @@
       [".T" procedure])
   )
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
index 261e6cfb9..f806805c0 100644
--- a/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/procedure/common.jvm.lux
@@ -147,7 +147,7 @@
       ))
 
 ## [[Bits]]
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -157,7 +157,7 @@
   [bit//xor runtimeT.bit//xor]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> (runtimeT.int64-low paramO) subjectO))]
@@ -184,7 +184,7 @@
   (#static MIN_VALUE Double)
   (#static MAX_VALUE Double))
 
-(do-template [<name> <const> <encode>]
+(template [<name> <const> <encode>]
   [(def: (<name> _)
      Nullary
      (<encode> <const>))]
@@ -194,7 +194,7 @@
   [frac//max      Double::MAX_VALUE            r.float]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (|> subjectO (<op> paramO)))]
@@ -206,7 +206,7 @@
   [int//rem        runtimeT.int//%]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -223,7 +223,7 @@
   [text//<   r.<]
   )
 
-(do-template [<name> <cmp>]
+(template [<name> <cmp>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<cmp> paramO subjectO))]
diff --git a/new-luxc/source/luxc/lang/translation/r/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/r/procedure/host.jvm.lux
index af82491b6..2793b40e8 100644
--- a/new-luxc/source/luxc/lang/translation/r/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/procedure/host.jvm.lux
@@ -14,7 +14,7 @@
   (/// [".T" runtime])
   (// ["@" common]))
 
-## (do-template [<name> <lua>]
+## (template [<name> <lua>]
 ##   [(def: (<name> _) @.Nullary <lua>)]
 
 ##   [lua//nil      "nil"]
diff --git a/new-luxc/source/luxc/lang/translation/r/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/r/reference.jvm.lux
index 087b87504..7de1c74ee 100644
--- a/new-luxc/source/luxc/lang/translation/r/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/reference.jvm.lux
@@ -9,7 +9,7 @@
   [//]
   (// [".T" runtime]))
 
-(do-template [<register> <translation> <prefix>]
+(template [<register> <translation> <prefix>]
   [(def: #export (<register> register)
      (-> Register SVar)
      (r.var (format <prefix> (%i (.int register)))))
diff --git a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
index ce2265a8e..d641041d2 100644
--- a/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/r/runtime.jvm.lux
@@ -163,7 +163,7 @@
   (r.named-list (list [//.int-high-field (as-integer (@@ high))]
                       [//.int-low-field (as-integer (@@ low))])))
 
-(do-template [<name> <value>]
+(template [<name> <value>]
   [(runtime: <name>
      (..int <value>))]
 
@@ -597,7 +597,7 @@
       @@sum//get
       ))
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(runtime: (<name> mask input)
      (int//new (<op> (int64-high (@@ mask))
                      (int64-high (@@ input)))
@@ -659,7 +659,7 @@
 
 (def: inc (-> Expression Expression) (|>> (r.+ (r.int 1))))
 
-(do-template [<name> <top-cmp>]
+(template [<name> <top-cmp>]
   [(def: (<name> top value)
      (-> Expression Expression Expression)
      (|> (|> value (r.>= (r.int 0)))
diff --git a/new-luxc/source/luxc/lang/translation/ruby.lux b/new-luxc/source/luxc/lang/translation/ruby.lux
index 501e8e2c1..084c614ec 100644
--- a/new-luxc/source/luxc/lang/translation/ruby.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby.lux
@@ -18,7 +18,7 @@
               (host [ruby #+ Ruby Expression Statement]))
         [".C" io]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux
index 52a261b2a..3742ae467 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/eval.jvm.lux
@@ -11,7 +11,7 @@
         (lang (host [ruby #+ Ruby Expression Statement])))
   [//])
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux
index 6023f3a82..3016836b9 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/expression.jvm.lux
@@ -21,7 +21,7 @@
       [".T" case]
       [".T" procedure]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
diff --git a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
index 9176879b1..c60938d79 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/procedure/common.jvm.lux
@@ -145,7 +145,7 @@
       ))
 
 ## [[Bits]]
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -160,7 +160,7 @@
   (ruby.bit-and "0xFFFFFFFFFFFFFFFF"
                 (ruby.bit-shl paramO subjectO)))
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -186,7 +186,7 @@
   (#static MIN_VALUE Double)
   (#static MAX_VALUE Double))
 
-(do-template [<name> <const> <encode>]
+(template [<name> <const> <encode>]
   [(def: (<name> _)
      Nullary
      (<encode> <const>))]
@@ -196,7 +196,7 @@
   [frac//max               Double::MAX_VALUE            ruby.float]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (ruby.bit-and "0xFFFFFFFFFFFFFFFF"
@@ -207,7 +207,7 @@
   [int//mul        ruby.*]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -216,7 +216,7 @@
   [int//rem        ruby.%]
   )
 
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<op> paramO subjectO))]
@@ -233,7 +233,7 @@
   [text//<   ruby.<]
   )
 
-(do-template [<name> <cmp>]
+(template [<name> <cmp>]
   [(def: (<name> [subjectO paramO])
      Binary
      (<cmp> paramO subjectO))]
@@ -291,7 +291,7 @@
           (install "decode" (unary frac//decode)))))
 
 ## [[Text]]
-(do-template [<name> <op>]
+(template [<name> <op>]
   [(def: <name>
      Unary
      (ruby.send <op> (list)))]
diff --git a/new-luxc/source/luxc/lang/translation/ruby/procedure/host.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/procedure/host.jvm.lux
index af82491b6..2793b40e8 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/procedure/host.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/procedure/host.jvm.lux
@@ -14,7 +14,7 @@
   (/// [".T" runtime])
   (// ["@" common]))
 
-## (do-template [<name> <lua>]
+## (template [<name> <lua>]
 ##   [(def: (<name> _) @.Nullary <lua>)]
 
 ##   [lua//nil      "nil"]
diff --git a/new-luxc/source/luxc/lang/translation/ruby/reference.jvm.lux b/new-luxc/source/luxc/lang/translation/ruby/reference.jvm.lux
index fb206b127..80e78951b 100644
--- a/new-luxc/source/luxc/lang/translation/ruby/reference.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/ruby/reference.jvm.lux
@@ -9,7 +9,7 @@
   [//]
   (// [".T" runtime]))
 
-(do-template [<register> <translation> <prefix>]
+(template [<register> <translation> <prefix>]
   [(def: #export (<register> register)
      (-> Register Expression)
      (format <prefix> (%i (.int register))))
diff --git a/new-luxc/source/luxc/lang/translation/scheme.lux b/new-luxc/source/luxc/lang/translation/scheme.lux
index 7d261ca04..e509cb8ca 100644
--- a/new-luxc/source/luxc/lang/translation/scheme.lux
+++ b/new-luxc/source/luxc/lang/translation/scheme.lux
@@ -18,7 +18,7 @@
               (host [scheme #+ Expression]))
         [".C" io]))
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]
 
@@ -164,7 +164,7 @@
   (function (_ compiler)
     (#e.Success [compiler (|> compiler (get@ #.host) (:coerce Host) (get@ #program-buffer))])))
 
-(do-template [<name> <field> <outputT>]
+(template [<name> <field> <outputT>]
   [(def: (<name> code)
      (-> Expression (Meta <outputT>))
      (function (_ compiler)
diff --git a/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux b/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux
index ae4a4151a..db9b25129 100644
--- a/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux
+++ b/new-luxc/source/luxc/lang/translation/scheme/eval.jvm.lux
@@ -13,7 +13,7 @@
         (lang (host [scheme #+ Expression])))
   [//])
 
-(do-template [<name>]
+(template [<name>]
   [(exception: #export (<name> {message Text})
      message)]