3 files changed, 42 insertions, 42 deletions
diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index a7eb07777..3bb609324 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -47,21 +47,21 @@
 
 (type: .public Visibility
   (Variant
-   #Public
-   #Protected
-   #Private
-   #Default))
+   {#Public}
+   {#Protected}
+   {#Private}
+   {#Default}))
 
 (type: .public Version
   (Variant
-   #V1_1
-   #V1_2
-   #V1_3
-   #V1_4
-   #V1_5
-   #V1_6
-   #V1_7
-   #V1_8))
+   {#V1_1}
+   {#V1_2}
+   {#V1_3}
+   {#V1_4}
+   {#V1_5}
+   {#V1_6}
+   {#V1_7}
+   {#V1_8}))
 
 (type: .public ByteCode
   Binary)
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index ecafc00d2..4aa88ff9a 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -90,43 +90,43 @@
 (def: (version_flag version)
   (-> //.Version Int)
   (case version
-    #//.V1_1 (org/objectweb/asm/Opcodes::V1_1)
-    #//.V1_2 (org/objectweb/asm/Opcodes::V1_2)
-    #//.V1_3 (org/objectweb/asm/Opcodes::V1_3)
-    #//.V1_4 (org/objectweb/asm/Opcodes::V1_4)
-    #//.V1_5 (org/objectweb/asm/Opcodes::V1_5)
-    #//.V1_6 (org/objectweb/asm/Opcodes::V1_6)
-    #//.V1_7 (org/objectweb/asm/Opcodes::V1_7)
-    #//.V1_8 (org/objectweb/asm/Opcodes::V1_8)))
+    {//.#V1_1} (org/objectweb/asm/Opcodes::V1_1)
+    {//.#V1_2} (org/objectweb/asm/Opcodes::V1_2)
+    {//.#V1_3} (org/objectweb/asm/Opcodes::V1_3)
+    {//.#V1_4} (org/objectweb/asm/Opcodes::V1_4)
+    {//.#V1_5} (org/objectweb/asm/Opcodes::V1_5)
+    {//.#V1_6} (org/objectweb/asm/Opcodes::V1_6)
+    {//.#V1_7} (org/objectweb/asm/Opcodes::V1_7)
+    {//.#V1_8} (org/objectweb/asm/Opcodes::V1_8)))
 
 (def: (visibility_flag visibility)
   (-> //.Visibility Int)
   (case visibility
-    #//.Public    (org/objectweb/asm/Opcodes::ACC_PUBLIC)
-    #//.Protected (org/objectweb/asm/Opcodes::ACC_PROTECTED)
-    #//.Private   (org/objectweb/asm/Opcodes::ACC_PRIVATE)
-    #//.Default   +0))
+    {//.#Public}    (org/objectweb/asm/Opcodes::ACC_PUBLIC)
+    {//.#Protected} (org/objectweb/asm/Opcodes::ACC_PROTECTED)
+    {//.#Private}   (org/objectweb/asm/Opcodes::ACC_PRIVATE)
+    {//.#Default}   +0))
 
 (def: (class_flags config)
   (-> //.Class_Config Int)
   ($_ i.+
-      (if (value@ #//.finalC config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)))
+      (if (value@ //.#finalC config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)))
 
 (def: (method_flags config)
   (-> //.Method_Config Int)
   ($_ i.+
-      (if (value@ #//.staticM config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0)
-      (if (value@ #//.finalM config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)
-      (if (value@ #//.synchronizedM config) (org/objectweb/asm/Opcodes::ACC_SYNCHRONIZED) +0)
-      (if (value@ #//.strictM config) (org/objectweb/asm/Opcodes::ACC_STRICT) +0)))
+      (if (value@ //.#staticM config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0)
+      (if (value@ //.#finalM config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)
+      (if (value@ //.#synchronizedM config) (org/objectweb/asm/Opcodes::ACC_SYNCHRONIZED) +0)
+      (if (value@ //.#strictM config) (org/objectweb/asm/Opcodes::ACC_STRICT) +0)))
 
 (def: (field_flags config)
   (-> //.Field_Config Int)
   ($_ i.+
-      (if (value@ #//.staticF config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0)
-      (if (value@ #//.finalF config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)
-      (if (value@ #//.transientF config) (org/objectweb/asm/Opcodes::ACC_TRANSIENT) +0)
-      (if (value@ #//.volatileF config) (org/objectweb/asm/Opcodes::ACC_VOLATILE) +0)))
+      (if (value@ //.#staticF config) (org/objectweb/asm/Opcodes::ACC_STATIC) +0)
+      (if (value@ //.#finalF config) (org/objectweb/asm/Opcodes::ACC_FINAL) +0)
+      (if (value@ //.#transientF config) (org/objectweb/asm/Opcodes::ACC_TRANSIENT) +0)
+      (if (value@ //.#volatileF config) (org/objectweb/asm/Opcodes::ACC_VOLATILE) +0)))
 
 (def: param_signature
   (-> (Type Class) Text)
@@ -293,11 +293,11 @@
 (def: .public (fuse defs)
   (-> (List //.Def) //.Def)
   (case defs
-    #.End
+    {.#End}
     function.identity
 
-    {#.Item singleton #.End}
+    {.#Item singleton {.#End}}
     singleton
 
-    {#.Item head tail}
+    {.#Item head tail}
     (function.composite (fuse tail) head)))
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index bbeffb023..64113cd68 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -152,7 +152,7 @@
 (def: .public make_label
   (All (_ s) (Operation s org/objectweb/asm/Label))
   (function (_ state)
-    {#try.Success [state (org/objectweb/asm/Label::new)]}))
+    {try.#Success [state (org/objectweb/asm/Label::new)]}))
 
 (def: .public (with_label action)
   (All (_ a) (-> (-> org/objectweb/asm/Label a) a))
@@ -414,10 +414,10 @@
 (def: .public (array elementT)
   (-> (Type Value) Inst)
   (case (type.primitive? elementT)
-    {#.Left elementT}
+    {.#Left elementT}
     (ANEWARRAY elementT)
 
-    {#.Right elementT}
+    {.#Right elementT}
     (NEWARRAY elementT)))
 
 (template [<name> <boolean> <byte> <short> <int> <long> <float> <double> <char>]
@@ -459,11 +459,11 @@
 (def: .public (fuse insts)
   (-> (List Inst) Inst)
   (case insts
-    #.End
+    {.#End}
     function.identity
 
-    {#.Item singleton #.End}
+    {.#Item singleton {.#End}}
     singleton
 
-    {#.Item head tail}
+    {.#Item head tail}
     (function.composite (fuse tail) head)))