- Changed the names of the tags of the Syntax type to differentiate them better from the tags of the Type type.

7 files changed, 189 insertions, 189 deletions

diff --git a/src/lux/analyser.clj b/src/lux/analyser.clj
index a47360ffb..c37c1acde 100644
--- a/src/lux/analyser.clj
+++ b/src/lux/analyser.clj
@@ -14,52 +14,52 @@
 ;; [Utils]
 (defn ^:private parse-handler [[catch+ finally+] token]
   (matchv ::M/objects [token]
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_catch"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?ex-class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?ex-arg]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_catch"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?ex-class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?ex-arg]]]]
                                                                           ["lux;Cons" [?catch-body
                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
     (&/T (&/|++ catch+ (|list (&/T ?ex-class ?ex-arg ?catch-body))) finally+)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_finally"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_finally"]]]]
                                                 ["lux;Cons" [?finally-body
                                                              ["lux;Nil" _]]]]]]]]]
     (&/T catch+ ?finally-body)))
 
-(let [unit (&/V "lux;Meta" (&/T (&/T "" -1 -1) (&/V "lux;Tuple" (|list))))]
+(let [unit (&/V "lux;Meta" (&/T (&/T "" -1 -1) (&/V "lux;TupleS" (|list))))]
   (defn ^:private aba1 [analyse eval! exo-type token]
     (matchv ::M/objects [token]
       ;; Standard special forms
-      [["lux;Meta" [meta ["lux;Bool" ?value]]]]
+      [["lux;Meta" [meta ["lux;BoolS" ?value]]]]
       (|do [_ (&type/check exo-type &type/Bool)]
         (return (&/|list (&/T (&/V "bool" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;Int" ?value]]]]
+      [["lux;Meta" [meta ["lux;IntS" ?value]]]]
       (|do [_ (&type/check exo-type &type/Int)]
         (return (&/|list (&/T (&/V "int" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;Real" ?value]]]]
+      [["lux;Meta" [meta ["lux;RealS" ?value]]]]
       (|do [_ (&type/check exo-type &type/Real)]
         (return (&/|list (&/T (&/V "real" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;Char" ?value]]]]
+      [["lux;Meta" [meta ["lux;CharS" ?value]]]]
       (|do [_ (&type/check exo-type &type/Char)]
         (return (&/|list (&/T (&/V "char" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;Text" ?value]]]]
+      [["lux;Meta" [meta ["lux;TextS" ?value]]]]
       (|do [_ (&type/check exo-type &type/Text)]
         (return (&/|list (&/T (&/V "text" ?value) exo-type))))
 
-      [["lux;Meta" [meta ["lux;Tuple" ?elems]]]]
+      [["lux;Meta" [meta ["lux;TupleS" ?elems]]]]
       (&&lux/analyse-tuple analyse exo-type ?elems)
 
-      [["lux;Meta" [meta ["lux;Record" ?elems]]]]
+      [["lux;Meta" [meta ["lux;RecordS" ?elems]]]]
       (&&lux/analyse-record analyse exo-type ?elems)
 
-      [["lux;Meta" [meta ["lux;Tag" ?ident]]]]
+      [["lux;Meta" [meta ["lux;TagS" ?ident]]]]
       (&&lux/analyse-variant analyse exo-type ?ident unit)
       
-      [["lux;Meta" [meta ["lux;Symbol" [_ "_jvm_null"]]]]]
+      [["lux;Meta" [meta ["lux;SymbolS" [_ "_jvm_null"]]]]]
       (return (&/|list (&/T (&/V "jvm-null" nil) (&/V "lux;DataT" "null"))))
 
       [_]
@@ -68,50 +68,50 @@
 
 (defn ^:private aba2 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
-    [["lux;Meta" [meta ["lux;Symbol" ?ident]]]]
+    [["lux;Meta" [meta ["lux;SymbolS" ?ident]]]]
     (&&lux/analyse-symbol analyse exo-type ?ident)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_lux_case"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_case"]]]]
                                                 ["lux;Cons" [?value ?branches]]]]]]]]
     (&&lux/analyse-case analyse exo-type ?value ?branches)
     
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_lux_lambda"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ?self]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ?arg]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_lambda"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?self]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?arg]]]
                                                                           ["lux;Cons" [?body
                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
     (&&lux/analyse-lambda analyse exo-type ?self ?arg ?body)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_lux_def"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?name]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_def"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?name]]]]
                                                              ["lux;Cons" [?value
                                                                           ["lux;Nil" _]]]]]]]]]]]
     (&&lux/analyse-def analyse ?name ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_lux_declare-macro"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?name]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_declare-macro"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?name]]]]
                                                              ["lux;Nil" _]]]]]]]]]
     (&&lux/analyse-declare-macro analyse ?name)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_lux_import"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Text" ?path]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_import"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;TextS" ?path]]]
                                                              ["lux;Nil" _]]]]]]]]]
     (&&lux/analyse-import analyse ?path)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_lux_:"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:"]]]]
                                                 ["lux;Cons" [?type
                                                              ["lux;Cons" [?value
                                                                           ["lux;Nil" _]]]]]]]]]]]
     (&&lux/analyse-check analyse eval! exo-type ?type ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_lux_:!"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_:!"]]]]
                                                 ["lux;Cons" [?type
                                                              ["lux;Cons" [?value
                                                                           ["lux;Nil" _]]]]]]]]]]]
     (&&lux/analyse-coerce analyse eval! ?type ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_lux_export"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?ident]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_lux_export"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?ident]]]]
                                                              ["lux;Nil" _]]]]]]]]]
     (&&lux/analyse-export analyse ?ident)
 
@@ -122,53 +122,53 @@
   (matchv ::M/objects [token]
     ;; Host special forms
     ;; Integer arithmetic
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_iadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_iadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-iadd analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_isub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_isub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-isub analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_imul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_imul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-imul analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_idiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_idiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-idiv analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_irem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_irem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-irem analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_ieq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ieq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-ieq analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_ilt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ilt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-ilt analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_igt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_igt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-igt analyse ?x ?y)
 
     ;; Long arithmetic
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_ladd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ladd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-ladd analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lsub analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lmul analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_ldiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ldiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-ldiv analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lrem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lrem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lrem analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_leq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_leq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-leq analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_llt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_llt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-llt analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lgt analyse ?x ?y)
 
     [_]
@@ -177,53 +177,53 @@
 (defn ^:private aba4 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
     ;; Float arithmetic
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_fadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-fadd analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_fsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-fsub analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_fmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-fmul analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_fdiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fdiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-fdiv analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_frem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_frem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-frem analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_feq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_feq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-feq analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_flt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_flt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-flt analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_fgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_fgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-fgt analyse ?x ?y)
 
     ;; Double arithmetic
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_dadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dadd"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-dadd analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_dsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dsub"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-dsub analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_dmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dmul"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-dmul analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_ddiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ddiv"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-ddiv analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_drem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_drem"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-drem analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_deq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_deq"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-deq analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_dlt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dlt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-dlt analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_dgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_dgt"]]]] ["lux;Cons" [?y ["lux;Cons" [?x ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-dgt analyse ?x ?y)
 
     [_]
@@ -232,99 +232,99 @@
 (defn ^:private aba5 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
     ;; Objects
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_null?"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_null?"]]]]
                                                 ["lux;Cons" [?object
                                                              ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-null? analyse ?object)
     
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_new"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?classes]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?args]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_new"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
+                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
     (&&host/analyse-jvm-new analyse ?class ?classes ?args)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_getstatic"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?field]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_getstatic"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
                                                                           ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-getstatic analyse ?class ?field)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_getfield"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?field]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_getfield"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
                                                                           ["lux;Cons" [?object
                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
     (&&host/analyse-jvm-getfield analyse ?class ?field ?object)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_putstatic"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?field]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_putstatic"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
                                                                           ["lux;Cons" [?value
                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
     (&&host/analyse-jvm-putstatic analyse ?class ?field ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_putfield"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?field]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_putfield"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?field]]]]
                                                                           ["lux;Cons" [?object
                                                                                        ["lux;Cons" [?value
                                                                                                     ["lux;Nil" _]]]]]]]]]]]]]]]
     (&&host/analyse-jvm-putfield analyse ?class ?field ?object ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_invokestatic"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?method]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?classes]]]
-                                                                                       ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?args]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokestatic"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
+                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
+                                                                                       ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
                                                                                                     ["lux;Nil" _]]]]]]]]]]]]]]]
     (&&host/analyse-jvm-invokestatic analyse ?class ?method ?classes ?args)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_invokevirtual"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?method]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?classes]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokevirtual"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
+                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
                                                                                        ["lux;Cons" [?object
-                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?args]]]
+                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
                                                                                                                  ["lux;Nil" _]]]]]]]]]]]]]]]]]
     (&&host/analyse-jvm-invokevirtual analyse ?class ?method ?classes ?object ?args)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_invokeinterface"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?method]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?classes]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokeinterface"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
+                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
                                                                                        ["lux;Cons" [?object
-                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?args]]]
+                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
                                                                                                                  ["lux;Nil" _]]]]]]]]]]]]]]]]]
     (&&host/analyse-jvm-invokeinterface analyse ?class ?method ?classes ?object ?args)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_invokespecial"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ?method]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?classes]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_invokespecial"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ?method]]]]
+                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?classes]]]
                                                                                        ["lux;Cons" [?object
-                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?args]]]
+                                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?args]]]
                                                                                                                  ["lux;Nil" _]]]]]]]]]]]]]]]]]
     (&&host/analyse-jvm-invokespecial analyse ?class ?method ?classes ?object ?args)
     
     ;; Exceptions
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_try"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_try"]]]]
                                                 ["lux;Cons" [?body
                                                              ?handlers]]]]]]]]
     (&&host/analyse-jvm-try analyse ?body (&/fold parse-handler [(list) nil] ?handlers))
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_throw"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_throw"]]]]
                                                 ["lux;Cons" [?ex
                                                              ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-throw analyse ?ex)
 
     ;; Syncronization/monitos
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_monitorenter"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_monitorenter"]]]]
                                                 ["lux;Cons" [?monitor
                                                              ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-monitorenter analyse ?monitor)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_monitorexit"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_monitorexit"]]]]
                                                 ["lux;Cons" [?monitor
                                                              ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-monitorexit analyse ?monitor)
@@ -335,74 +335,74 @@
 (defn ^:private aba6 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
     ;; Primitive conversions
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_d2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-d2f analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_d2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-d2i analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_d2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_d2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-d2l analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_f2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-f2d analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_f2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-f2i analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_f2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_f2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-f2l analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_i2b"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2b"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-i2b analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_i2c"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2c"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-i2c analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_i2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-i2d analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_i2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-i2f analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_i2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2l"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-i2l analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_i2s"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_i2s"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-i2s analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_l2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2d"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-l2d analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_l2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2f"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-l2f analyse ?value)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_l2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_l2i"]]]] ["lux;Cons" [?value ["lux;Nil" _]]]]]]]]]
     (&&host/analyse-jvm-l2i analyse ?value)
 
     ;; Bitwise operators
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_iand"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_iand"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-iand analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_ior"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_ior"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-ior analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_land"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_land"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-land analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lor"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lor"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lor analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lxor"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lxor"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lxor analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lshl"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lshl"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lshl analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lshr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lshr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lshr analyse ?x ?y)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_lushr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_lushr"]]]] ["lux;Cons" [?x ["lux;Cons" [?y ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-lushr analyse ?x ?y)
 
     [_]
@@ -411,41 +411,41 @@
 (defn ^:private aba7 [analyse eval! exo-type token]
   (matchv ::M/objects [token]
     ;; Arrays
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_new-array"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?class]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Int" ?length]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_new-array"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?class]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?length]]]
                                                                           ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-new-array analyse ?class ?length)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_aastore"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aastore"]]]]
                                                 ["lux;Cons" [?array
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Int" ?idx]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
                                                                           ["lux;Cons" [?elem
                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
     (&&host/analyse-jvm-aastore analyse ?array ?idx ?elem)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_aaload"]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_aaload"]]]]
                                                 ["lux;Cons" [?array
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Int" ?idx]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;IntS" ?idx]]]
                                                                           ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-aaload analyse ?array ?idx)
 
     ;; Classes & interfaces
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_class"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?name]]]]
-                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?super-class]]]]
-                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?fields]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_class"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?name]]]]
+                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?super-class]]]]
+                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?fields]]]
                                                                                        ["lux;Nil" _]]]]]]]]]]]]]
     (&&host/analyse-jvm-class analyse ?name ?super-class ?fields)
 
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_interface"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?name]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_interface"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?name]]]]
                                                              ?members]]]]]]]]
     (&&host/analyse-jvm-interface analyse ?name ?members)
 
     ;; Programs
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "_jvm_program"]]]]
-                                                ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?args]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "_jvm_program"]]]]
+                                                ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?args]]]]
                                                              ["lux;Cons" [?body
                                                                           ["lux;Nil" _]]]]]]]]]]]
     (&&host/analyse-jvm-program analyse ?args ?body)
@@ -512,11 +512,11 @@
 
 (defn ^:private analyse-ast [eval! exo-type token]
   (matchv ::M/objects [token]
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Tag" ?ident]]] ?values]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;TagS" ?ident]]] ?values]]]]]]
     (do (assert (= 1 (&/|length ?values)) "[Analyser Error] Can only tag 1 value.")
       (&&lux/analyse-variant (partial analyse-ast eval!) exo-type ?ident (&/|head ?values)))
     
-    [["lux;Meta" [meta ["lux;Form" ["lux;Cons" [?fn ?args]]]]]]
+    [["lux;Meta" [meta ["lux;FormS" ["lux;Cons" [?fn ?args]]]]]]
     (fn [state]
       (matchv ::M/objects [((&type/with-var #(&&/analyse-1 (partial analyse-ast eval!) % ?fn)) state)]
         [["lux;Right" [state* =fn]]]
diff --git a/src/lux/analyser/case.clj b/src/lux/analyser/case.clj
index f18dc7836..f27a541ee 100644
--- a/src/lux/analyser/case.clj
+++ b/src/lux/analyser/case.clj
@@ -22,38 +22,38 @@
   (matchv ::M/objects [pattern]
     [["lux;Meta" [_ pattern*]]]
     (matchv ::M/objects [pattern*]
-      [["lux;Symbol" ?ident]]
+      [["lux;SymbolS" ?ident]]
       (|do [=kont (&env/with-local (&/ident->text ?ident) value-type
                     kont)
             idx &env/next-local-idx]
         (return (&/T (&/V "StoreTestAC" idx) =kont)))
 
-      [["lux;Bool" ?value]]
+      [["lux;BoolS" ?value]]
       (|do [_ (&type/check value-type &type/Bool)
             =kont kont]
         (return (&/T (&/V "BoolTestAC" ?value) =kont)))
 
-      [["lux;Int" ?value]]
+      [["lux;IntS" ?value]]
       (|do [_ (&type/check value-type &type/Int)
             =kont kont]
         (return (&/T (&/V "IntTestAC" ?value) =kont)))
 
-      [["lux;Real" ?value]]
+      [["lux;RealS" ?value]]
       (|do [_ (&type/check value-type &type/Real)
             =kont kont]
         (return (&/T (&/V "RealTestAC" ?value) =kont)))
 
-      [["lux;Char" ?value]]
+      [["lux;CharS" ?value]]
       (|do [_ (&type/check value-type &type/Char)
             =kont kont]
         (return (&/T (&/V "CharTestAC" ?value) =kont)))
 
-      [["lux;Text" ?value]]
+      [["lux;TextS" ?value]]
       (|do [_ (&type/check value-type &type/Text)
             =kont kont]
         (return (&/T (&/V "TextTestAC" ?value) =kont)))
 
-      [["lux;Tuple" ?members]]
+      [["lux;TupleS" ?members]]
       (matchv ::M/objects [value-type]
         [["lux;TupleT" ?member-types]]
         (if (not (= (&/|length ?member-types) (&/|length ?members)))
@@ -70,7 +70,7 @@
         [_]
         (fail "[Analyser Error] Tuple requires tuple-type."))
 
-      [["lux;Record" ?slots]]
+      [["lux;RecordS" ?slots]]
       (|do [value-type* (resolve-type value-type)]
         (matchv ::M/objects [value-type*]
           [["lux;RecordT" ?slot-types]]
@@ -79,7 +79,7 @@
             (|do [[=tests =kont] (&/fold (fn [kont* slot]
                                            (|let [[sn sv] slot]
                                              (matchv ::M/objects [sn]
-                                               [["lux;Meta" [_ ["lux;Tag" ?ident]]]]
+                                               [["lux;Meta" [_ ["lux;TagS" ?ident]]]]
                                                (|do [=tag (&&/resolved-ident ?ident)]
                                                  (if-let [=slot-type (&/|get =tag ?slot-types)]
                                                    (|do [[=test [=tests =kont]] (analyse-pattern =slot-type sv kont*)]
@@ -96,18 +96,18 @@
           [_]
           (fail "[Analyser Error] Record requires record-type.")))
 
-      [["lux;Tag" ?ident]]
+      [["lux;TagS" ?ident]]
       (|do [=tag (&&/resolved-ident ?ident)
             value-type* (resolve-type value-type)
             case-type (&type/variant-case =tag value-type*)
             [=test =kont] (analyse-pattern case-type (&/V "lux;Meta" (&/T (&/T "" -1 -1)
-                                                                          (&/V "lux;Tuple" (&/|list))))
+                                                                          (&/V "lux;TupleS" (&/|list))))
                                            kont)]
         (return (&/T (&/V "VariantTestAC" (&/T =tag =test)) =kont)))
 
-      [["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Tag" ?ident]]]
-                                ["lux;Cons" [?value
-                                             ["lux;Nil" _]]]]]]]
+      [["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;TagS" ?ident]]]
+                                 ["lux;Cons" [?value
+                                              ["lux;Nil" _]]]]]]]
       (|do [=tag (&&/resolved-ident ?ident)
             value-type* (resolve-type value-type)
             case-type (&type/variant-case =tag value-type*)
diff --git a/src/lux/analyser/host.clj b/src/lux/analyser/host.clj
index 527c69dc7..9f80c43cc 100644
--- a/src/lux/analyser/host.clj
+++ b/src/lux/analyser/host.clj
@@ -12,7 +12,7 @@
 ;; [Utils]
 (defn ^:private extract-ident [ident]
   (matchv ::M/objects [ident]
-    [["lux;Meta" [_ ["lux;Symbol" [_ ?ident]]]]]
+    [["lux;Meta" [_ ["lux;SymbolS" [_ ?ident]]]]]
     (return ?ident)
 
     [_]
@@ -142,9 +142,9 @@
 (defn analyse-jvm-class [analyse ?name ?super-class ?fields]
   (|do [?fields (&/map% (fn [?field]
                           (matchv ::M/objects [?field]
-                            [["lux;Meta" [_ ["lux;Tuple" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ?class]]]
-                                                                      ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ?field-name]]]
-                                                                                   ["lux;Nil" _]]]]]]]]]
+                            [["lux;Meta" [_ ["lux;TupleS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?class]]]
+                                                                       ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ?field-name]]]
+                                                                                    ["lux;Nil" _]]]]]]]]]
                             (return [?class ?field-name])
                             
                             [_]
@@ -159,13 +159,13 @@
 (defn analyse-jvm-interface [analyse ?name ?members]
   (|do [=members (&/map% (fn [member]
                            (matchv ::M/objects [member]
-                             [["lux;Meta" [_ ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" ["" ":"]]]]
-                                                                      ["lux;Cons" [["lux;Meta" [_ ["lux;Form" ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ "->"]]]]
-                                                                                                                           ["lux;Cons" [["lux;Meta" [_ ["lux;Tuple" ?inputs]]]
-                                                                                                                                        ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?output]]]]
-                                                                                                                                                     ["lux;Nil" _]]]]]]]]]]
-                                                                                   ["lux;Cons" [["lux;Meta" [_ ["lux;Symbol" [_ ?member-name]]]]
-                                                                                                ["lux;Nil" _]]]]]]]]]]]
+                             [["lux;Meta" [_ ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" ["" ":"]]]]
+                                                                       ["lux;Cons" [["lux;Meta" [_ ["lux;FormS" ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ "->"]]]]
+                                                                                                                             ["lux;Cons" [["lux;Meta" [_ ["lux;TupleS" ?inputs]]]
+                                                                                                                                          ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?output]]]]
+                                                                                                                                                       ["lux;Nil" _]]]]]]]]]]
+                                                                                    ["lux;Cons" [["lux;Meta" [_ ["lux;SymbolS" [_ ?member-name]]]]
+                                                                                                 ["lux;Nil" _]]]]]]]]]]]
                              (|do [inputs* (&/map% extract-ident ?inputs)]
                                (return [?member-name [inputs* ?output]]))
                              
diff --git a/src/lux/analyser/lux.clj b/src/lux/analyser/lux.clj
index b65963e4a..1b0c70f77 100644
--- a/src/lux/analyser/lux.clj
+++ b/src/lux/analyser/lux.clj
@@ -86,7 +86,7 @@
                 (fail "[Analyser Error] The type of a record must be a record type."))
         =slots (&/map% (fn [kv]
                          (matchv ::M/objects [kv]
-                           [[["lux;Meta" [_ ["lux;Tag" ?ident]]] ?value]]
+                           [[["lux;Meta" [_ ["lux;TagS" ?ident]]] ?value]]
                            (|do [?tag (&&/resolved-ident ?ident)
                                  slot-type (if-let [slot-type (&/|get ?tag types)]
                                              (return slot-type)
diff --git a/src/lux/host.clj b/src/lux/host.clj
index d159d2608..77687dbef 100644
--- a/src/lux/host.clj
+++ b/src/lux/host.clj
@@ -69,7 +69,7 @@
 
 (defn extract-jvm-param [token]
   (matchv ::M/objects [token]
-    [["lux;Meta" [_ ["lux;Symbol" [_ ?ident]]]]]
+    [["lux;Meta" [_ ["lux;SymbolS" [_ ?ident]]]]]
     (return ?ident)
 
     [_]
diff --git a/src/lux/parser.clj b/src/lux/parser.clj
index 6b392ea96..7a3ad18aa 100644
--- a/src/lux/parser.clj
+++ b/src/lux/parser.clj
@@ -17,8 +17,8 @@
         [_]
         (fail (str "[Parser Error] Unbalanced " <description> ".")))))
 
-  ^:private parse-form  "Close_Paren"   "parantheses" "lux;Form"
-  ^:private parse-tuple "Close_Bracket" "brackets"    "lux;Tuple"
+  ^:private parse-form  "Close_Paren"   "parantheses" "lux;FormS"
+  ^:private parse-tuple "Close_Bracket" "brackets"    "lux;TupleS"
   )
 
 (defn ^:private parse-record [parse]
@@ -28,7 +28,7 @@
     (matchv ::M/objects [token]
       [["lux;Meta" [meta ["Close_Brace" _]]]]
       (if (even? (&/|length elems))
-        (return (&/V "lux;Record" (&/|as-pairs elems)))
+        (return (&/V "lux;RecordS" (&/|as-pairs elems)))
         (fail (str "[Parser Error] Records must have an even number of elements.")))
       
       [_]
@@ -47,25 +47,25 @@
         (return (&/|list))
         
         [["Bool" ?value]]
-        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;Bool" (Boolean/parseBoolean ?value))))))
+        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;BoolS" (Boolean/parseBoolean ?value))))))
 
         [["Int" ?value]]
-        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;Int" (Integer/parseInt ?value))))))
+        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;IntS" (Integer/parseInt ?value))))))
 
         [["Real" ?value]]
-        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;Real" (Float/parseFloat ?value))))))
+        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;RealS" (Float/parseFloat ?value))))))
 
         [["Char" ^String ?value]]
-        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;Char" (.charAt ?value 0))))))
+        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;CharS" (.charAt ?value 0))))))
 
         [["Text" ?value]]
-        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;Text" ?value)))))
+        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;TextS" ?value)))))
 
         [["Symbol" ?ident]]
-        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;Symbol" ?ident)))))
+        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;SymbolS" ?ident)))))
 
         [["Tag" ?ident]]
-        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;Tag" ?ident)))))
+        (return (&/|list (&/V "lux;Meta" (&/T meta (&/V "lux;TagS" ?ident)))))
 
         [["Open_Paren" _]]
         (|do [syntax (parse-form parse)]
diff --git a/src/lux/type.clj b/src/lux/type.clj
index 494d8ebbc..97b7c1bde 100644
--- a/src/lux/type.clj
+++ b/src/lux/type.clj
@@ -85,16 +85,16 @@
                                                           (&/V "lux;BoundT" "w")))))
         Syntax*List (&/V "lux;AppT" (&/T List Syntax*))]
     (fAll "Syntax'" "w"
-          (&/V "lux;VariantT" (&/|list (&/T "lux;Bool" Bool)
-                                       (&/T "lux;Int" Int)
-                                       (&/T "lux;Real" Real)
-                                       (&/T "lux;Char" Char)
-                                       (&/T "lux;Text" Text)
-                                       (&/T "lux;Symbol" Ident)
-                                       (&/T "lux;Tag" Ident)
-                                       (&/T "lux;Form" Syntax*List)
-                                       (&/T "lux;Tuple" Syntax*List)
-                                       (&/T "lux;Record" (&/V "lux;AppT" (&/T List (&/V "lux;TupleT" (&/|list Syntax* Syntax*))))))
+          (&/V "lux;VariantT" (&/|list (&/T "lux;BoolS" Bool)
+                                       (&/T "lux;IntS" Int)
+                                       (&/T "lux;RealS" Real)
+                                       (&/T "lux;CharS" Char)
+                                       (&/T "lux;TextS" Text)
+                                       (&/T "lux;SymbolS" Ident)
+                                       (&/T "lux;TagS" Ident)
+                                       (&/T "lux;FormS" Syntax*List)
+                                       (&/T "lux;TupleS" Syntax*List)
+                                       (&/T "lux;RecordS" (&/V "lux;AppT" (&/T List (&/V "lux;TupleT" (&/|list Syntax* Syntax*))))))
                ))))
 
 (def Syntax