Made JVM "import:" syntax consistent with the other "import:"s.

7 files changed, 756 insertions, 748 deletions

diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index a3b28b710..19e98ae20 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -44,10 +44,9 @@
        ["[0]" generation]
        ["[0]" directive {"+" Requirements}]
        ["[0]" analysis {"+" Analysis}
-        ["[0]A" type]]
+        ["[0]A" type]
+        ["[0]A" scope]]
        [phase
-        [analysis
-         ["[0]A" scope]]
         ["[0]" extension
          ["[0]" bundle]
          [analysis
@@ -69,520 +68,520 @@
     [extension
      ["//G" host]]]]])
 
-... (import: org/objectweb/asm/Label
-...   ["[1]::[0]"
-...    (new [])])
-
-... (def: (literal literal)
-...   (-> /.Literal Inst)
-...   (case literal
-...     {/.#Boolean value} (_.boolean value)
-...     {/.#Int value} (_.int value)
-...     {/.#Long value} (_.long value)
-...     {/.#Double value} (_.double value)
-...     {/.#Char value} (_.char value)
-...     {/.#String value} (_.string value)))
-
-... (def: (constant instruction)
-...   (-> /.Constant Inst)
-...   (case instruction
-...     {/.#BIPUSH constant} (_.BIPUSH constant)
+(import: org/objectweb/asm/Label
+  "[1]::[0]"
+  (new []))
+
+(def: (literal literal)
+  (-> /.Literal Inst)
+  (case literal
+    {/.#Boolean value} (_.boolean value)
+    {/.#Int value} (_.int value)
+    {/.#Long value} (_.long value)
+    {/.#Double value} (_.double value)
+    {/.#Char value} (_.char value)
+    {/.#String value} (_.string value)))
+
+(def: (constant instruction)
+  (-> /.Constant Inst)
+  (case instruction
+    {/.#BIPUSH constant} (_.BIPUSH constant)
     
-...     {/.#SIPUSH constant} (_.SIPUSH constant)
-
-...     {/.#ICONST_M1} _.ICONST_M1
-...     {/.#ICONST_0} _.ICONST_0
-...     {/.#ICONST_1} _.ICONST_1
-...     {/.#ICONST_2} _.ICONST_2
-...     {/.#ICONST_3} _.ICONST_3
-...     {/.#ICONST_4} _.ICONST_4
-...     {/.#ICONST_5} _.ICONST_5
-
-...     {/.#LCONST_0} _.LCONST_0
-...     {/.#LCONST_1} _.LCONST_1
+    {/.#SIPUSH constant} (_.SIPUSH constant)
+
+    {/.#ICONST_M1} _.ICONST_M1
+    {/.#ICONST_0} _.ICONST_0
+    {/.#ICONST_1} _.ICONST_1
+    {/.#ICONST_2} _.ICONST_2
+    {/.#ICONST_3} _.ICONST_3
+    {/.#ICONST_4} _.ICONST_4
+    {/.#ICONST_5} _.ICONST_5
+
+    {/.#LCONST_0} _.LCONST_0
+    {/.#LCONST_1} _.LCONST_1
     
-...     {/.#FCONST_0} _.FCONST_0
-...     {/.#FCONST_1} _.FCONST_1
-...     {/.#FCONST_2} _.FCONST_2
+    {/.#FCONST_0} _.FCONST_0
+    {/.#FCONST_1} _.FCONST_1
+    {/.#FCONST_2} _.FCONST_2
     
-...     {/.#DCONST_0} _.DCONST_0
-...     {/.#DCONST_1} _.DCONST_1
+    {/.#DCONST_0} _.DCONST_0
+    {/.#DCONST_1} _.DCONST_1
     
-...     {/.#ACONST_NULL} _.NULL
-
-...     {/.#LDC literal}
-...     (..literal literal)
-...     ))
-
-... (def: (int_arithmetic instruction)
-...   (-> /.Int_Arithmetic Inst)
-...   (case instruction
-...     {/.#IADD} _.IADD
-...     {/.#ISUB} _.ISUB
-...     {/.#IMUL} _.IMUL
-...     {/.#IDIV} _.IDIV
-...     {/.#IREM} _.IREM
-...     {/.#INEG} _.INEG))
-
-... (def: (long_arithmetic instruction)
-...   (-> /.Long_Arithmetic Inst)
-...   (case instruction
-...     {/.#LADD} _.LADD
-...     {/.#LSUB} _.LSUB
-...     {/.#LMUL} _.LMUL
-...     {/.#LDIV} _.LDIV
-...     {/.#LREM} _.LREM
-...     {/.#LNEG} _.LNEG))
-
-... (def: (float_arithmetic instruction)
-...   (-> /.Float_Arithmetic Inst)
-...   (case instruction
-...     {/.#FADD} _.FADD
-...     {/.#FSUB} _.FSUB
-...     {/.#FMUL} _.FMUL
-...     {/.#FDIV} _.FDIV
-...     {/.#FREM} _.FREM
-...     {/.#FNEG} _.FNEG))
-
-... (def: (double_arithmetic instruction)
-...   (-> /.Double_Arithmetic Inst)
-...   (case instruction
-...     {/.#DADD} _.DADD
-...     {/.#DSUB} _.DSUB
-...     {/.#DMUL} _.DMUL
-...     {/.#DDIV} _.DDIV
-...     {/.#DREM} _.DREM
-...     {/.#DNEG} _.DNEG))
-
-... (def: (arithmetic instruction)
-...   (-> /.Arithmetic Inst)
-...   (case instruction
-...     {/.#Int_Arithmetic int_arithmetic}
-...     (..int_arithmetic int_arithmetic)
+    {/.#ACONST_NULL} _.NULL
+
+    {/.#LDC literal}
+    (..literal literal)
+    ))
+
+(def: (int_arithmetic instruction)
+  (-> /.Int_Arithmetic Inst)
+  (case instruction
+    {/.#IADD} _.IADD
+    {/.#ISUB} _.ISUB
+    {/.#IMUL} _.IMUL
+    {/.#IDIV} _.IDIV
+    {/.#IREM} _.IREM
+    {/.#INEG} _.INEG))
+
+(def: (long_arithmetic instruction)
+  (-> /.Long_Arithmetic Inst)
+  (case instruction
+    {/.#LADD} _.LADD
+    {/.#LSUB} _.LSUB
+    {/.#LMUL} _.LMUL
+    {/.#LDIV} _.LDIV
+    {/.#LREM} _.LREM
+    {/.#LNEG} _.LNEG))
+
+(def: (float_arithmetic instruction)
+  (-> /.Float_Arithmetic Inst)
+  (case instruction
+    {/.#FADD} _.FADD
+    {/.#FSUB} _.FSUB
+    {/.#FMUL} _.FMUL
+    {/.#FDIV} _.FDIV
+    {/.#FREM} _.FREM
+    {/.#FNEG} _.FNEG))
+
+(def: (double_arithmetic instruction)
+  (-> /.Double_Arithmetic Inst)
+  (case instruction
+    {/.#DADD} _.DADD
+    {/.#DSUB} _.DSUB
+    {/.#DMUL} _.DMUL
+    {/.#DDIV} _.DDIV
+    {/.#DREM} _.DREM
+    {/.#DNEG} _.DNEG))
+
+(def: (arithmetic instruction)
+  (-> /.Arithmetic Inst)
+  (case instruction
+    {/.#Int_Arithmetic int_arithmetic}
+    (..int_arithmetic int_arithmetic)
     
-...     {/.#Long_Arithmetic long_arithmetic}
-...     (..long_arithmetic long_arithmetic)
+    {/.#Long_Arithmetic long_arithmetic}
+    (..long_arithmetic long_arithmetic)
     
-...     {/.#Float_Arithmetic float_arithmetic}
-...     (..float_arithmetic float_arithmetic)
+    {/.#Float_Arithmetic float_arithmetic}
+    (..float_arithmetic float_arithmetic)
     
-...     {/.#Double_Arithmetic double_arithmetic}
-...     (..double_arithmetic double_arithmetic)))
-
-... (def: (int_bitwise instruction)
-...   (-> /.Int_Bitwise Inst)
-...   (case instruction
-...     {/.#IOR} _.IOR
-...     {/.#IXOR} _.IXOR
-...     {/.#IAND} _.IAND
-...     {/.#ISHL} _.ISHL
-...     {/.#ISHR} _.ISHR
-...     {/.#IUSHR} _.IUSHR))
-
-... (def: (long_bitwise instruction)
-...   (-> /.Long_Bitwise Inst)
-...   (case instruction
-...     {/.#LOR} _.LOR
-...     {/.#LXOR} _.LXOR
-...     {/.#LAND} _.LAND
-...     {/.#LSHL} _.LSHL
-...     {/.#LSHR} _.LSHR
-...     {/.#LUSHR} _.LUSHR))
-
-... (def: (bitwise instruction)
-...   (-> /.Bitwise Inst)
-...   (case instruction
-...     {/.#Int_Bitwise int_bitwise}
-...     (..int_bitwise int_bitwise)
+    {/.#Double_Arithmetic double_arithmetic}
+    (..double_arithmetic double_arithmetic)))
+
+(def: (int_bitwise instruction)
+  (-> /.Int_Bitwise Inst)
+  (case instruction
+    {/.#IOR} _.IOR
+    {/.#IXOR} _.IXOR
+    {/.#IAND} _.IAND
+    {/.#ISHL} _.ISHL
+    {/.#ISHR} _.ISHR
+    {/.#IUSHR} _.IUSHR))
+
+(def: (long_bitwise instruction)
+  (-> /.Long_Bitwise Inst)
+  (case instruction
+    {/.#LOR} _.LOR
+    {/.#LXOR} _.LXOR
+    {/.#LAND} _.LAND
+    {/.#LSHL} _.LSHL
+    {/.#LSHR} _.LSHR
+    {/.#LUSHR} _.LUSHR))
+
+(def: (bitwise instruction)
+  (-> /.Bitwise Inst)
+  (case instruction
+    {/.#Int_Bitwise int_bitwise}
+    (..int_bitwise int_bitwise)
     
-...     {/.#Long_Bitwise long_bitwise}
-...     (..long_bitwise long_bitwise)))
-
-... (def: (conversion instruction)
-...   (-> /.Conversion Inst)
-...   (case instruction
-...     {/.#I2B} _.I2B
-...     {/.#I2S} _.I2S
-...     {/.#I2L} _.I2L
-...     {/.#I2F} _.I2F
-...     {/.#I2D} _.I2D
-...     {/.#I2C} _.I2C
-
-...     {/.#L2I} _.L2I
-...     {/.#L2F} _.L2F
-...     {/.#L2D} _.L2D
-
-...     {/.#F2I} _.F2I
-...     {/.#F2L} _.F2L
-...     {/.#F2D} _.F2D
+    {/.#Long_Bitwise long_bitwise}
+    (..long_bitwise long_bitwise)))
+
+(def: (conversion instruction)
+  (-> /.Conversion Inst)
+  (case instruction
+    {/.#I2B} _.I2B
+    {/.#I2S} _.I2S
+    {/.#I2L} _.I2L
+    {/.#I2F} _.I2F
+    {/.#I2D} _.I2D
+    {/.#I2C} _.I2C
+
+    {/.#L2I} _.L2I
+    {/.#L2F} _.L2F
+    {/.#L2D} _.L2D
+
+    {/.#F2I} _.F2I
+    {/.#F2L} _.F2L
+    {/.#F2D} _.F2D
     
-...     {/.#D2I} _.D2I
-...     {/.#D2L} _.D2L
-...     {/.#D2F} _.D2F))
+    {/.#D2I} _.D2I
+    {/.#D2L} _.D2L
+    {/.#D2F} _.D2F))
 
-... (def: (array instruction)
-...   (-> /.Array Inst)
-...   (case instruction
-...     {/.#ARRAYLENGTH} _.ARRAYLENGTH
+(def: (array instruction)
+  (-> /.Array Inst)
+  (case instruction
+    {/.#ARRAYLENGTH} _.ARRAYLENGTH
 
-...     {/.#NEWARRAY type} (_.NEWARRAY type)
-...     {/.#ANEWARRAY type} (_.ANEWARRAY type)
+    {/.#NEWARRAY type} (_.NEWARRAY type)
+    {/.#ANEWARRAY type} (_.ANEWARRAY type)
 
-...     {/.#BALOAD} _.BALOAD
-...     {/.#BASTORE} _.BASTORE
+    {/.#BALOAD} _.BALOAD
+    {/.#BASTORE} _.BASTORE
 
-...     {/.#SALOAD} _.SALOAD
-...     {/.#SASTORE} _.SASTORE
+    {/.#SALOAD} _.SALOAD
+    {/.#SASTORE} _.SASTORE
 
-...     {/.#IALOAD} _.IALOAD
-...     {/.#IASTORE} _.IASTORE
+    {/.#IALOAD} _.IALOAD
+    {/.#IASTORE} _.IASTORE
 
-...     {/.#LALOAD} _.LALOAD
-...     {/.#LASTORE} _.LASTORE
+    {/.#LALOAD} _.LALOAD
+    {/.#LASTORE} _.LASTORE
 
-...     {/.#FALOAD} _.FALOAD
-...     {/.#FASTORE} _.FASTORE
+    {/.#FALOAD} _.FALOAD
+    {/.#FASTORE} _.FASTORE
 
-...     {/.#DALOAD} _.DALOAD
-...     {/.#DASTORE} _.DASTORE
+    {/.#DALOAD} _.DALOAD
+    {/.#DASTORE} _.DASTORE
     
-...     {/.#CALOAD} _.CALOAD
-...     {/.#CASTORE} _.CASTORE
-
-...     {/.#AALOAD} _.AALOAD
-...     {/.#AASTORE} _.AASTORE))
-
-... (def: (object instruction)
-...   (-> /.Object Inst)
-...   (case instruction
-...     (^template [<tag> <inst>]
-...       [{<tag> class field_name field_type}
-...        (<inst> class field_name field_type)])
-...     ([/.#GETSTATIC _.GETSTATIC]
-...      [/.#PUTSTATIC _.PUTSTATIC]
-...      [/.#GETFIELD _.GETFIELD]
-...      [/.#PUTFIELD _.PUTFIELD])
+    {/.#CALOAD} _.CALOAD
+    {/.#CASTORE} _.CASTORE
+
+    {/.#AALOAD} _.AALOAD
+    {/.#AASTORE} _.AASTORE))
+
+(def: (object instruction)
+  (-> /.Object Inst)
+  (case instruction
+    (^template [<tag> <inst>]
+      [{<tag> class field_name field_type}
+       (<inst> class field_name field_type)])
+    ([/.#GETSTATIC _.GETSTATIC]
+     [/.#PUTSTATIC _.PUTSTATIC]
+     [/.#GETFIELD _.GETFIELD]
+     [/.#PUTFIELD _.PUTFIELD])
     
-...     {/.#NEW type} (_.NEW type)
+    {/.#NEW type} (_.NEW type)
     
-...     {/.#INSTANCEOF type} (_.INSTANCEOF type)
-...     {/.#CHECKCAST type} (_.CHECKCAST type)
-
-...     (^template [<tag> <inst>]
-...       [{<tag> class method_name method_type}
-...        (<inst> class method_name method_type)])
-...     ([/.#INVOKEINTERFACE _.INVOKEINTERFACE]
-...      [/.#INVOKESPECIAL _.INVOKESPECIAL]
-...      [/.#INVOKESTATIC _.INVOKESTATIC]
-...      [/.#INVOKEVIRTUAL _.INVOKEVIRTUAL])
-...     ))
-
-... (def: (local_int instruction)
-...   (-> /.Local_Int Inst)
-...   (case instruction
-...     {/.#ILOAD register} (_.ILOAD register)
-...     {/.#ISTORE register} (_.ISTORE register)))
-
-... (def: (local_long instruction)
-...   (-> /.Local_Long Inst)
-...   (case instruction
-...     {/.#LLOAD register} (_.LLOAD register)
-...     {/.#LSTORE register} (_.LSTORE register)))
-
-... (def: (local_float instruction)
-...   (-> /.Local_Float Inst)
-...   (case instruction
-...     {/.#FLOAD register} (_.FLOAD register)
-...     {/.#FSTORE register} (_.FSTORE register)))
-
-... (def: (local_double instruction)
-...   (-> /.Local_Double Inst)
-...   (case instruction
-...     {/.#DLOAD register} (_.DLOAD register)
-...     {/.#DSTORE register} (_.DSTORE register)))
-
-... (def: (local_object instruction)
-...   (-> /.Local_Object Inst)
-...   (case instruction
-...     {/.#ALOAD register} (_.ALOAD register)
-...     {/.#ASTORE register} (_.ASTORE register)))
-
-... (def: (local instruction)
-...   (-> /.Local Inst)
-...   (case instruction
-...     {/.#Local_Int instruction} (..local_int instruction)
-...     {/.#IINC register} (_.IINC register)
-...     {/.#Local_Long instruction} (..local_long instruction)
-...     {/.#Local_Float instruction} (..local_float instruction)
-...     {/.#Local_Double instruction} (..local_double instruction)
-...     {/.#Local_Object instruction} (..local_object instruction)))
-
-... (def: (stack instruction)
-...   (-> /.Stack Inst)
-...   (case instruction
-...     {/.#DUP} _.DUP
-...     {/.#DUP_X1} _.DUP_X1
-...     {/.#DUP_X2} _.DUP_X2
-...     {/.#DUP2} _.DUP2
-...     {/.#DUP2_X1} _.DUP2_X1
-...     {/.#DUP2_X2} _.DUP2_X2
-...     {/.#SWAP} _.SWAP
-...     {/.#POP} _.POP
-...     {/.#POP2} _.POP2))
-
-... (def: (comparison instruction)
-...   (-> /.Comparison Inst)
-...   (case instruction
-...     {/.#LCMP} _.LCMP
+    {/.#INSTANCEOF type} (_.INSTANCEOF type)
+    {/.#CHECKCAST type} (_.CHECKCAST type)
+
+    (^template [<tag> <inst>]
+      [{<tag> class method_name method_type}
+       (<inst> class method_name method_type)])
+    ([/.#INVOKEINTERFACE _.INVOKEINTERFACE]
+     [/.#INVOKESPECIAL _.INVOKESPECIAL]
+     [/.#INVOKESTATIC _.INVOKESTATIC]
+     [/.#INVOKEVIRTUAL _.INVOKEVIRTUAL])
+    ))
+
+(def: (local_int instruction)
+  (-> /.Local_Int Inst)
+  (case instruction
+    {/.#ILOAD register} (_.ILOAD register)
+    {/.#ISTORE register} (_.ISTORE register)))
+
+(def: (local_long instruction)
+  (-> /.Local_Long Inst)
+  (case instruction
+    {/.#LLOAD register} (_.LLOAD register)
+    {/.#LSTORE register} (_.LSTORE register)))
+
+(def: (local_float instruction)
+  (-> /.Local_Float Inst)
+  (case instruction
+    {/.#FLOAD register} (_.FLOAD register)
+    {/.#FSTORE register} (_.FSTORE register)))
+
+(def: (local_double instruction)
+  (-> /.Local_Double Inst)
+  (case instruction
+    {/.#DLOAD register} (_.DLOAD register)
+    {/.#DSTORE register} (_.DSTORE register)))
+
+(def: (local_object instruction)
+  (-> /.Local_Object Inst)
+  (case instruction
+    {/.#ALOAD register} (_.ALOAD register)
+    {/.#ASTORE register} (_.ASTORE register)))
+
+(def: (local instruction)
+  (-> /.Local Inst)
+  (case instruction
+    {/.#Local_Int instruction} (..local_int instruction)
+    {/.#IINC register} (_.IINC register)
+    {/.#Local_Long instruction} (..local_long instruction)
+    {/.#Local_Float instruction} (..local_float instruction)
+    {/.#Local_Double instruction} (..local_double instruction)
+    {/.#Local_Object instruction} (..local_object instruction)))
+
+(def: (stack instruction)
+  (-> /.Stack Inst)
+  (case instruction
+    {/.#DUP} _.DUP
+    {/.#DUP_X1} _.DUP_X1
+    {/.#DUP_X2} _.DUP_X2
+    {/.#DUP2} _.DUP2
+    {/.#DUP2_X1} _.DUP2_X1
+    {/.#DUP2_X2} _.DUP2_X2
+    {/.#SWAP} _.SWAP
+    {/.#POP} _.POP
+    {/.#POP2} _.POP2))
+
+(def: (comparison instruction)
+  (-> /.Comparison Inst)
+  (case instruction
+    {/.#LCMP} _.LCMP
     
-...     {/.#FCMPG} _.FCMPG
-...     {/.#FCMPL} _.FCMPL
-
-...     {/.#DCMPG} _.DCMPG
-...     {/.#DCMPL} _.DCMPL))
-
-... (def: (branching instruction)
-...   (-> (/.Branching org/objectweb/asm/Label) Inst)
-...   (case instruction
-...     {/.#IF_ICMPEQ label} (_.IF_ICMPEQ label)
-...     {/.#IF_ICMPGE label} (_.IF_ICMPGE label)
-...     {/.#IF_ICMPGT label} (_.IF_ICMPGT label)
-...     {/.#IF_ICMPLE label} (_.IF_ICMPLE label)
-...     {/.#IF_ICMPLT label} (_.IF_ICMPLT label)
-...     {/.#IF_ICMPNE label} (_.IF_ICMPNE label)
-...     {/.#IFEQ label} (_.IFEQ label)
-...     {/.#IFGE label} (_.IFGE label)
-...     {/.#IFGT label} (_.IFGT label)
-...     {/.#IFLE label} (_.IFLE label)
-...     {/.#IFLT label} (_.IFLT label)
-...     {/.#IFNE label} (_.IFNE label)
-
-...     {/.#TABLESWITCH min max default labels}
-...     (_.TABLESWITCH min max default labels)
+    {/.#FCMPG} _.FCMPG
+    {/.#FCMPL} _.FCMPL
+
+    {/.#DCMPG} _.DCMPG
+    {/.#DCMPL} _.DCMPL))
+
+(def: (branching instruction)
+  (-> (/.Branching org/objectweb/asm/Label) Inst)
+  (case instruction
+    {/.#IF_ICMPEQ label} (_.IF_ICMPEQ label)
+    {/.#IF_ICMPGE label} (_.IF_ICMPGE label)
+    {/.#IF_ICMPGT label} (_.IF_ICMPGT label)
+    {/.#IF_ICMPLE label} (_.IF_ICMPLE label)
+    {/.#IF_ICMPLT label} (_.IF_ICMPLT label)
+    {/.#IF_ICMPNE label} (_.IF_ICMPNE label)
+    {/.#IFEQ label} (_.IFEQ label)
+    {/.#IFGE label} (_.IFGE label)
+    {/.#IFGT label} (_.IFGT label)
+    {/.#IFLE label} (_.IFLE label)
+    {/.#IFLT label} (_.IFLT label)
+    {/.#IFNE label} (_.IFNE label)
+
+    {/.#TABLESWITCH min max default labels}
+    (_.TABLESWITCH min max default labels)
     
-...     {/.#LOOKUPSWITCH default keys+labels}
-...     (_.LOOKUPSWITCH default keys+labels)
-
-...     {/.#IF_ACMPEQ label} (_.IF_ACMPEQ label)
-...     {/.#IF_ACMPNE label} (_.IF_ACMPNE label)
-...     {/.#IFNONNULL label} (_.IFNONNULL label)
-...     {/.#IFNULL label} (_.IFNULL label)))
-
-... (def: (exception instruction)
-...   (-> (/.Exception org/objectweb/asm/Label) Inst)
-...   (case instruction
-...     {/.#Try start end handler exception} (_.try start end handler exception)
-...     {/.#ATHROW} _.ATHROW))
-
-... (def: (concurrency instruction)
-...   (-> /.Concurrency Inst)
-...   (case instruction
-...     {/.#MONITORENTER} _.MONITORENTER
-...     {/.#MONITOREXIT} _.MONITOREXIT))
-
-... (def: (return instruction)
-...   (-> /.Return Inst)
-...   (case instruction
-...     {/.#RETURN} _.RETURN
-...     {/.#IRETURN} _.IRETURN
-...     {/.#LRETURN} _.LRETURN
-...     {/.#FRETURN} _.FRETURN
-...     {/.#DRETURN} _.DRETURN
-...     {/.#ARETURN} _.ARETURN))
-
-... (def: (control instruction)
-...   (-> (/.Control org/objectweb/asm/Label) Inst)
-...   (case instruction
-...     {/.#GOTO label} (_.GOTO label)
-...     {/.#Branching instruction} (..branching instruction)
-...     {/.#Exception instruction} (..exception instruction)
-...     {/.#Concurrency instruction} (..concurrency instruction)
-...     {/.#Return instruction} (..return instruction)))
-
-... (def: (instruction instruction)
-...   (-> (/.Instruction Inst org/objectweb/asm/Label) Inst)
-...   (case instruction
-...     {/.#NOP} _.NOP
-...     {/.#Constant instruction} (..constant instruction)
-...     {/.#Arithmetic instruction} (..arithmetic instruction)
-...     {/.#Bitwise instruction} (..bitwise instruction)
-...     {/.#Conversion instruction} (..conversion instruction)
-...     {/.#Array instruction} (..array instruction)
-...     {/.#Object instruction} (..object instruction)
-...     {/.#Local instruction} (..local instruction)
-...     {/.#Stack instruction} (..stack instruction)
-...     {/.#Comparison instruction} (..comparison instruction)
-...     {/.#Control instruction} (..control instruction)
-...     {/.#Embedded embedded} embedded))
-
-... (type: Mapping
-...   (Dictionary /.Label org/objectweb/asm/Label))
-
-... (type: (Re_labeler context)
-...   (-> [Mapping (context /.Label)]
-...       [Mapping (context org/objectweb/asm/Label)]))
-
-... (def: (relabel [mapping label])
-...   (Re_labeler Identity)
-...   (case (dictionary.value label mapping)
-...     {.#Some label}
-...     [mapping label]
-
-...     {.#None}
-...     (let [label' (org/objectweb/asm/Label::new)]
-...       [(dictionary.has label label' mapping) label'])))
-
-... (def: (relabel_branching [mapping instruction])
-...   (Re_labeler /.Branching)
-...   (case instruction
-...     (^template [<tag>]
-...       [{<tag> label}
-...        (let [[mapping label] (..relabel [mapping label])]
-...          [mapping {<tag> label}])])
-...     ([/.#IF_ICMPEQ] [/.#IF_ICMPGE] [/.#IF_ICMPGT] [/.#IF_ICMPLE] [/.#IF_ICMPLT] [/.#IF_ICMPNE]
-...      [/.#IFEQ] [/.#IFNE] [/.#IFGE] [/.#IFGT] [/.#IFLE] [/.#IFLT]
-
-...      [/.#IF_ACMPEQ] [/.#IF_ACMPNE] [/.#IFNONNULL] [/.#IFNULL])
-
-...     {/.#TABLESWITCH min max default labels}
-...     (let [[mapping default] (..relabel [mapping default])
-...           [mapping labels] (list#mix (function (_ input [mapping output])
-...                                        (let [[mapping input] (..relabel [mapping input])]
-...                                          [mapping (list& input output)]))
-...                                      [mapping (list)] labels)]
-...       [mapping {/.#TABLESWITCH min max default (list.reversed labels)}])
+    {/.#LOOKUPSWITCH default keys+labels}
+    (_.LOOKUPSWITCH default keys+labels)
+
+    {/.#IF_ACMPEQ label} (_.IF_ACMPEQ label)
+    {/.#IF_ACMPNE label} (_.IF_ACMPNE label)
+    {/.#IFNONNULL label} (_.IFNONNULL label)
+    {/.#IFNULL label} (_.IFNULL label)))
+
+(def: (exception instruction)
+  (-> (/.Exception org/objectweb/asm/Label) Inst)
+  (case instruction
+    {/.#Try start end handler exception} (_.try start end handler exception)
+    {/.#ATHROW} _.ATHROW))
+
+(def: (concurrency instruction)
+  (-> /.Concurrency Inst)
+  (case instruction
+    {/.#MONITORENTER} _.MONITORENTER
+    {/.#MONITOREXIT} _.MONITOREXIT))
+
+(def: (return instruction)
+  (-> /.Return Inst)
+  (case instruction
+    {/.#RETURN} _.RETURN
+    {/.#IRETURN} _.IRETURN
+    {/.#LRETURN} _.LRETURN
+    {/.#FRETURN} _.FRETURN
+    {/.#DRETURN} _.DRETURN
+    {/.#ARETURN} _.ARETURN))
+
+(def: (control instruction)
+  (-> (/.Control org/objectweb/asm/Label) Inst)
+  (case instruction
+    {/.#GOTO label} (_.GOTO label)
+    {/.#Branching instruction} (..branching instruction)
+    {/.#Exception instruction} (..exception instruction)
+    {/.#Concurrency instruction} (..concurrency instruction)
+    {/.#Return instruction} (..return instruction)))
+
+(def: (instruction instruction)
+  (-> (/.Instruction Inst org/objectweb/asm/Label) Inst)
+  (case instruction
+    {/.#NOP} _.NOP
+    {/.#Constant instruction} (..constant instruction)
+    {/.#Arithmetic instruction} (..arithmetic instruction)
+    {/.#Bitwise instruction} (..bitwise instruction)
+    {/.#Conversion instruction} (..conversion instruction)
+    {/.#Array instruction} (..array instruction)
+    {/.#Object instruction} (..object instruction)
+    {/.#Local instruction} (..local instruction)
+    {/.#Stack instruction} (..stack instruction)
+    {/.#Comparison instruction} (..comparison instruction)
+    {/.#Control instruction} (..control instruction)
+    {/.#Embedded embedded} embedded))
+
+(type: Mapping
+  (Dictionary /.Label org/objectweb/asm/Label))
+
+(type: (Re_labeler context)
+  (-> [Mapping (context /.Label)]
+      [Mapping (context org/objectweb/asm/Label)]))
+
+(def: (relabel [mapping label])
+  (Re_labeler Identity)
+  (case (dictionary.value label mapping)
+    {.#Some label}
+    [mapping label]
+
+    {.#None}
+    (let [label' (org/objectweb/asm/Label::new)]
+      [(dictionary.has label label' mapping) label'])))
+
+(def: (relabel_branching [mapping instruction])
+  (Re_labeler /.Branching)
+  (case instruction
+    (^template [<tag>]
+      [{<tag> label}
+       (let [[mapping label] (..relabel [mapping label])]
+         [mapping {<tag> label}])])
+    ([/.#IF_ICMPEQ] [/.#IF_ICMPGE] [/.#IF_ICMPGT] [/.#IF_ICMPLE] [/.#IF_ICMPLT] [/.#IF_ICMPNE]
+     [/.#IFEQ] [/.#IFNE] [/.#IFGE] [/.#IFGT] [/.#IFLE] [/.#IFLT]
+
+     [/.#IF_ACMPEQ] [/.#IF_ACMPNE] [/.#IFNONNULL] [/.#IFNULL])
+
+    {/.#TABLESWITCH min max default labels}
+    (let [[mapping default] (..relabel [mapping default])
+          [mapping labels] (list#mix (function (_ input [mapping output])
+                                       (let [[mapping input] (..relabel [mapping input])]
+                                         [mapping (list& input output)]))
+                                     [mapping (list)] labels)]
+      [mapping {/.#TABLESWITCH min max default (list.reversed labels)}])
     
-...     {/.#LOOKUPSWITCH default keys+labels}
-...     (let [[mapping default] (..relabel [mapping default])
-...           [mapping keys+labels] (list#mix (function (_ [expected input] [mapping output])
-...                                             (let [[mapping input] (..relabel [mapping input])]
-...                                               [mapping (list& [expected input] output)]))
-...                                           [mapping (list)] keys+labels)]
-...       [mapping {/.#LOOKUPSWITCH default (list.reversed keys+labels)}])
-...     ))
-
-... (def: (relabel_exception [mapping instruction])
-...   (Re_labeler /.Exception)
-...   (case instruction
-...     {/.#Try start end handler exception}
-...     (let [[mapping start] (..relabel [mapping start])
-...           [mapping end] (..relabel [mapping end])
-...           [mapping handler] (..relabel [mapping handler])]
-...       [mapping {/.#Try start end handler exception}])
+    {/.#LOOKUPSWITCH default keys+labels}
+    (let [[mapping default] (..relabel [mapping default])
+          [mapping keys+labels] (list#mix (function (_ [expected input] [mapping output])
+                                            (let [[mapping input] (..relabel [mapping input])]
+                                              [mapping (list& [expected input] output)]))
+                                          [mapping (list)] keys+labels)]
+      [mapping {/.#LOOKUPSWITCH default (list.reversed keys+labels)}])
+    ))
+
+(def: (relabel_exception [mapping instruction])
+  (Re_labeler /.Exception)
+  (case instruction
+    {/.#Try start end handler exception}
+    (let [[mapping start] (..relabel [mapping start])
+          [mapping end] (..relabel [mapping end])
+          [mapping handler] (..relabel [mapping handler])]
+      [mapping {/.#Try start end handler exception}])
     
-...     {/.#ATHROW}
-...     [mapping {/.#ATHROW}]
-...     ))
-
-... (def: (relabel_control [mapping instruction])
-...   (Re_labeler /.Control)
-...   (case instruction
-...     (^template [<tag> <relabel>]
-...       [{<tag> instruction}
-...        (let [[mapping instruction] (<relabel> [mapping instruction])]
-...          [mapping {<tag> instruction}])])
-...     ([/.#GOTO ..relabel]
-...      [/.#Branching ..relabel_branching]
-...      [/.#Exception ..relabel_exception])
-
-...     (^template [<tag>]
-...       [{<tag> instruction}
-...        [mapping {<tag> instruction}]])
-...     ([/.#Concurrency] [/.#Return])
-...     ))
-
-... (def: (relabel_instruction [mapping instruction])
-...   (Re_labeler (/.Instruction Inst))
-...   (case instruction
-...     {/.#Embedded embedded}
-...     [mapping {/.#Embedded embedded}]
-
-...     {/.#NOP}
-...     [mapping {/.#NOP}]
-
-...     (^template [<tag>]
-...       [{<tag> instruction}
-...        [mapping {<tag> instruction}]])
-...     ([/.#Constant]
-...      [/.#Arithmetic]
-...      [/.#Bitwise]
-...      [/.#Conversion]
-...      [/.#Array]
-...      [/.#Object]
-...      [/.#Local]
-...      [/.#Stack]
-...      [/.#Comparison])
+    {/.#ATHROW}
+    [mapping {/.#ATHROW}]
+    ))
+
+(def: (relabel_control [mapping instruction])
+  (Re_labeler /.Control)
+  (case instruction
+    (^template [<tag> <relabel>]
+      [{<tag> instruction}
+       (let [[mapping instruction] (<relabel> [mapping instruction])]
+         [mapping {<tag> instruction}])])
+    ([/.#GOTO ..relabel]
+     [/.#Branching ..relabel_branching]
+     [/.#Exception ..relabel_exception])
+
+    (^template [<tag>]
+      [{<tag> instruction}
+       [mapping {<tag> instruction}]])
+    ([/.#Concurrency] [/.#Return])
+    ))
+
+(def: (relabel_instruction [mapping instruction])
+  (Re_labeler (/.Instruction Inst))
+  (case instruction
+    {/.#Embedded embedded}
+    [mapping {/.#Embedded embedded}]
+
+    {/.#NOP}
+    [mapping {/.#NOP}]
+
+    (^template [<tag>]
+      [{<tag> instruction}
+       [mapping {<tag> instruction}]])
+    ([/.#Constant]
+     [/.#Arithmetic]
+     [/.#Bitwise]
+     [/.#Conversion]
+     [/.#Array]
+     [/.#Object]
+     [/.#Local]
+     [/.#Stack]
+     [/.#Comparison])
     
-...     {/.#Control instruction}
-...     (let [[mapping instruction] (..relabel_control [mapping instruction])]
-...       [mapping {/.#Control instruction}])))
-
-... (def: (relabel_bytecode [mapping bytecode])
-...   (Re_labeler (/.Bytecode Inst))
-...   (sequence#mix (function (_ input [mapping output])
-...                   (let [[mapping input'] (..relabel_instruction [mapping input])]
-...                     [mapping (sequence.suffix input' output)]))
-...                 [mapping (sequence.sequence)]
-...                 bytecode))
-
-... (def: fresh
-...   Mapping
-...   (dictionary.empty nat.hash))
-
-... (def: bytecode
-...   (-> (/.Bytecode Inst /.Label) jvm.Inst)
-...   (|>> [..fresh]
-...        ..relabel_bytecode
-...        product.right
-...        (sequence#each ..instruction)
-...        sequence.list
-...        _.fuse))
-
-... (with_expansions [<anchor> (as_is jvm.Anchor)
-...                   <expression> (as_is Inst)
-...                   <directive> (as_is jvm.Definition)
-...                   <type_vars> (as_is <anchor> <expression> <directive>)]
-...   (type: Handler'
-...     ... (generation.Handler jvm.Anchor (/.Bytecode Inst /.Label) jvm.Definition)
-...     (-> extension.Name
-...         (phase.Phase [(extension.Bundle <type_vars>)
-...                       (generation.State <type_vars>)]
-...                      Synthesis
-...                      <expression>)
-...         (phase.Phase [(extension.Bundle <type_vars>)
-...                       (generation.State <type_vars>)]
-...                      (List Synthesis)
-...                      (/.Bytecode Inst /.Label)))))
-
-... (def: (true_handler extender pseudo)
-...   (-> jvm.Extender Any jvm.Handler)
-...   (function (_ extension_name phase archive inputs)
-...     (# phase.monad each
-...        (|>> (:as (/.Bytecode Inst /.Label)) ..bytecode)
-...        ((extender pseudo) extension_name phase archive inputs))))
-
-... (type: Phase (directive.Phase jvm.Anchor jvm.Inst jvm.Definition))
-... (type: Operation (directive.Operation jvm.Anchor jvm.Inst jvm.Definition))
-... (type: Handler (directive.Handler jvm.Anchor jvm.Inst jvm.Definition))
-
-... (def: (def::generation extender)
-...   (-> jvm.Extender ..Handler)
-...   (function (handler extension_name phase archive inputsC+)
-...     (case inputsC+
-...       (^ (list nameC valueC))
-...       (do phase.monad
-...         [[_ _ name] (lux/.evaluate! archive Text nameC)
-...          [_ handlerV] (lux/.generator archive (:as Text name) ..Handler' valueC)
-...          _ (|> handlerV
-...                (..true_handler extender)
-...                (extension.install extender (:as Text name))
-...                directive.lifted_generation)
-...          _ (directive.lifted_generation
-...             (generation.log! (format "Generation " (%.text (:as Text name)))))]
-...         (in directive.no_requirements))
-
-...       _
-...       (phase.except extension.invalid_syntax [extension_name %.code inputsC+]))))
+    {/.#Control instruction}
+    (let [[mapping instruction] (..relabel_control [mapping instruction])]
+      [mapping {/.#Control instruction}])))
+
+(def: (relabel_bytecode [mapping bytecode])
+  (Re_labeler (/.Bytecode Inst))
+  (sequence#mix (function (_ input [mapping output])
+                  (let [[mapping input'] (..relabel_instruction [mapping input])]
+                    [mapping (sequence.suffix input' output)]))
+                [mapping (sequence.sequence)]
+                bytecode))
+
+(def: fresh
+  Mapping
+  (dictionary.empty nat.hash))
+
+(def: bytecode
+  (-> (/.Bytecode Inst /.Label) jvm.Inst)
+  (|>> [..fresh]
+       ..relabel_bytecode
+       product.right
+       (sequence#each ..instruction)
+       sequence.list
+       _.fuse))
+
+(with_expansions [<anchor> (as_is jvm.Anchor)
+                  <expression> (as_is Inst)
+                  <directive> (as_is jvm.Definition)
+                  <type_vars> (as_is <anchor> <expression> <directive>)]
+  (type: Handler'
+    ... (generation.Handler jvm.Anchor (/.Bytecode Inst /.Label) jvm.Definition)
+    (-> extension.Name
+        (phase.Phase [(extension.Bundle <type_vars>)
+                      (generation.State <type_vars>)]
+                     Synthesis
+                     <expression>)
+        (phase.Phase [(extension.Bundle <type_vars>)
+                      (generation.State <type_vars>)]
+                     (List Synthesis)
+                     (/.Bytecode Inst /.Label)))))
+
+(def: (true_handler extender pseudo)
+  (-> jvm.Extender Any jvm.Handler)
+  (function (_ extension_name phase archive inputs)
+    (# phase.monad each
+       (|>> (:as (/.Bytecode Inst /.Label)) ..bytecode)
+       ((extender pseudo) extension_name phase archive inputs))))
+
+(type: Phase (directive.Phase jvm.Anchor jvm.Inst jvm.Definition))
+(type: Operation (directive.Operation jvm.Anchor jvm.Inst jvm.Definition))
+(type: Handler (directive.Handler jvm.Anchor jvm.Inst jvm.Definition))
+
+(def: (def::generation extender)
+  (-> jvm.Extender ..Handler)
+  (function (handler extension_name phase archive inputsC+)
+    (case inputsC+
+      (^ (list nameC valueC))
+      (do phase.monad
+        [[_ _ name] (lux/.evaluate! archive Text nameC)
+         [_ handlerV] (lux/.generator archive (:as Text name) ..Handler' valueC)
+         _ (|> handlerV
+               (..true_handler extender)
+               (extension.install extender (:as Text name))
+               directive.lifted_generation)
+         _ (directive.lifted_generation
+            (generation.log! (format "Generation " (%.text (:as Text name)))))]
+        (in directive.no_requirements))
+
+      _
+      (phase.except extension.invalid_syntax [extension_name %.code inputsC+]))))
 
 (def: .public (custom [parser handler])
   (All (_ i)
@@ -1070,7 +1069,7 @@
                            list.reversed
                            (list#mix scopeA.with_local (analyse archive bodyC))
                            (typeA.expecting returnT)
-                           analysis.with_scope)]
+                           scopeA.with)]
        (in [privacy strict_floating_point? annotations method_tvars exceptions
             self arguments constructor_argumentsA
             bodyA])))))
@@ -1100,7 +1099,7 @@
                            list.reversed
                            (list#mix scopeA.with_local (analyse archive bodyC))
                            (typeA.expecting returnT)
-                           analysis.with_scope)]
+                           scopeA.with)]
        (in [[super_name super_tvars] method_name strict_floating_point? annotations
             method_tvars self arguments returnJ exceptionsJ
             bodyA])))))
@@ -1128,7 +1127,7 @@
                            list.reversed
                            (list#mix scopeA.with_local (analyse archive bodyC))
                            (typeA.expecting returnT)
-                           analysis.with_scope)]
+                           scopeA.with)]
        (in [name privacy final? strict_floating_point? annotations method_tvars
             self arguments returnJ exceptionsJ
             bodyA])))))
@@ -1153,7 +1152,7 @@
                            list.reversed
                            (list#mix scopeA.with_local (analyse archive bodyC))
                            (typeA.expecting returnT)
-                           analysis.with_scope)]
+                           scopeA.with)]
        (in [name privacy strict_floating_point? annotations method_tvars
             arguments returnJ exceptionsJ
             bodyA])))))
@@ -1516,6 +1515,6 @@
 (def: .public (bundle class_loader extender)
   (-> java/lang/ClassLoader jvm.Extender (directive.Bundle jvm.Anchor jvm.Inst jvm.Definition))
   (|> bundle.empty
-      ... (dictionary.has "lux def generation" (..def::generation extender))
+      (dictionary.has "lux def generation" (..def::generation extender))
       (dictionary.has "jvm class" (..jvm::class class_loader))
       (dictionary.has "jvm class interface" ..jvm::class::interface)))
diff --git a/lux-jvm/source/luxc/lang/host/jvm.lux b/lux-jvm/source/luxc/lang/host/jvm.lux
index 017dd834a..dc942529d 100644
--- a/lux-jvm/source/luxc/lang/host/jvm.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm.lux
@@ -30,13 +30,15 @@
      [meta
       [archive {"+" Archive}]]]]]])
 
-(import: org/objectweb/asm/MethodVisitor)
+(import: org/objectweb/asm/MethodVisitor
+  "[1]::[0]")
 
-(import: org/objectweb/asm/ClassWriter)
+(import: org/objectweb/asm/ClassWriter
+  "[1]::[0]")
 
 (import: org/objectweb/asm/Label
-  ["[1]::[0]"
-   (new [])])
+  "[1]::[0]"
+  (new []))
 
 (type: .public Def
   (-> org/objectweb/asm/ClassWriter org/objectweb/asm/ClassWriter))
diff --git a/lux-jvm/source/luxc/lang/host/jvm/def.lux b/lux-jvm/source/luxc/lang/host/jvm/def.lux
index e7174a61e..fd79d2119 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/def.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/def.lux
@@ -28,56 +28,59 @@
 (def: descriptor (|>> type.descriptor descriptor.descriptor))
 (def: class_name (|>> type.descriptor descriptor.class_name name.read))
 
-(import: java/lang/Object)
-(import: java/lang/String)
+(import: java/lang/Object
+  "[1]::[0]")
+
+(import: java/lang/String
+  "[1]::[0]")
 
 (import: org/objectweb/asm/Opcodes
-  ["[1]::[0]"
-   ("static" ACC_PUBLIC int)
-   ("static" ACC_PROTECTED int)
-   ("static" ACC_PRIVATE int)
-
-   ("static" ACC_TRANSIENT int)
-   ("static" ACC_VOLATILE int)
-
-   ("static" ACC_ABSTRACT int)
-   ("static" ACC_FINAL int)
-   ("static" ACC_STATIC int)
-   ("static" ACC_SYNCHRONIZED int)
-   ("static" ACC_STRICT int)
-
-   ("static" ACC_SUPER int)
-   ("static" ACC_INTERFACE int)
-
-   ("static" V1_1 int)
-   ("static" V1_2 int)
-   ("static" V1_3 int)
-   ("static" V1_4 int)
-   ("static" V1_5 int)
-   ("static" V1_6 int)
-   ("static" V1_7 int)
-   ("static" V1_8 int)])
+  "[1]::[0]"
+  ("static" ACC_PUBLIC int)
+  ("static" ACC_PROTECTED int)
+  ("static" ACC_PRIVATE int)
+
+  ("static" ACC_TRANSIENT int)
+  ("static" ACC_VOLATILE int)
+
+  ("static" ACC_ABSTRACT int)
+  ("static" ACC_FINAL int)
+  ("static" ACC_STATIC int)
+  ("static" ACC_SYNCHRONIZED int)
+  ("static" ACC_STRICT int)
+
+  ("static" ACC_SUPER int)
+  ("static" ACC_INTERFACE int)
+
+  ("static" V1_1 int)
+  ("static" V1_2 int)
+  ("static" V1_3 int)
+  ("static" V1_4 int)
+  ("static" V1_5 int)
+  ("static" V1_6 int)
+  ("static" V1_7 int)
+  ("static" V1_8 int))
 
 (import: org/objectweb/asm/FieldVisitor
-  ["[1]::[0]"
-   (visitEnd [] void)])
+  "[1]::[0]"
+  (visitEnd [] void))
 
 (import: org/objectweb/asm/MethodVisitor
-  ["[1]::[0]"
-   (visitCode [] void)
-   (visitMaxs [int int] void)
-   (visitEnd [] void)])
+  "[1]::[0]"
+  (visitCode [] void)
+  (visitMaxs [int int] void)
+  (visitEnd [] void))
 
 (import: org/objectweb/asm/ClassWriter
-  ["[1]::[0]"
-   ("static" COMPUTE_MAXS int)
-   ("static" COMPUTE_FRAMES int)
-   (new [int])
-   (visit [int int java/lang/String java/lang/String java/lang/String [java/lang/String]] void)
-   (visitEnd [] void)
-   (visitField [int java/lang/String java/lang/String java/lang/String java/lang/Object] org/objectweb/asm/FieldVisitor)
-   (visitMethod [int java/lang/String java/lang/String java/lang/String [java/lang/String]] org/objectweb/asm/MethodVisitor)
-   (toByteArray [] [byte])])
+  "[1]::[0]"
+  ("static" COMPUTE_MAXS int)
+  ("static" COMPUTE_FRAMES int)
+  (new [int])
+  (visit [int int java/lang/String java/lang/String java/lang/String [java/lang/String]] void)
+  (visitEnd [] void)
+  (visitField [int java/lang/String java/lang/String java/lang/String java/lang/Object] org/objectweb/asm/FieldVisitor)
+  (visitMethod [int java/lang/String java/lang/String java/lang/String [java/lang/String]] org/objectweb/asm/MethodVisitor)
+  (toByteArray [] [byte]))
 
 (def: (string_array values)
   (-> (List Text) (Array Text))
diff --git a/lux-jvm/source/luxc/lang/host/jvm/inst.lux b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
index 7af807189..8b75e4169 100644
--- a/lux-jvm/source/luxc/lang/host/jvm/inst.lux
+++ b/lux-jvm/source/luxc/lang/host/jvm/inst.lux
@@ -1,48 +1,51 @@
 (.using
-  [library
-   [lux {"-" Type Primitive int char try}
-    ["[0]" ffi {"+" import: do_to}]
-    [abstract
-     [monad {"+" do}]]
-    [control
-     ["[0]" function]
-     ["[0]" maybe]
-     ["[0]" try]
-     ["p" parser
-      ["s" code]]]
-    [data
-     ["[0]" product]
-     [collection
-      ["[0]" list ("[1]@[0]" functor)]]]
-    [macro
-     [syntax {"+" syntax:}]
-     ["[0]" code]
-     ["[0]" template]]
-    [math
-     [number
-      ["n" nat]
-      ["i" int]]]
-    [target
-     [jvm
-      [encoding
-       ["[0]" name {"+" External}]]
-      ["[0]" type {"+" Type} ("[1]@[0]" equivalence)
-       [category {"+" Void Value Return Method Primitive Object Class Array Var Parameter}]
-       ["[0]" box]
-       ["[0]" descriptor]
-       ["[0]" reflection]]]]
-    [tool
-     [compiler
-      [phase {"+" Operation}]]]]]
-  ["[0]" // {"+" Inst}])
+ [library
+  [lux {"-" Type Primitive int char try}
+   ["[0]" ffi {"+" import: do_to}]
+   [abstract
+    [monad {"+" do}]]
+   [control
+    ["[0]" function]
+    ["[0]" maybe]
+    ["[0]" try]
+    ["p" parser
+     ["s" code]]]
+   [data
+    ["[0]" product]
+    [collection
+     ["[0]" list ("[1]@[0]" functor)]]]
+   [macro
+    [syntax {"+" syntax:}]
+    ["[0]" code]
+    ["[0]" template]]
+   [math
+    [number
+     ["n" nat]
+     ["i" int]]]
+   [target
+    [jvm
+     [encoding
+      ["[0]" name {"+" External}]]
+     ["[0]" type {"+" Type} ("[1]@[0]" equivalence)
+      [category {"+" Void Value Return Method Primitive Object Class Array Var Parameter}]
+      ["[0]" box]
+      ["[0]" descriptor]
+      ["[0]" reflection]]]]
+   [tool
+    [compiler
+     [phase {"+" Operation}]]]]]
+ ["[0]" // {"+" Inst}])
 
 (def: class_name (|>> type.descriptor descriptor.class_name name.read))
 (def: descriptor (|>> type.descriptor descriptor.descriptor))
 (def: reflection (|>> type.reflection reflection.reflection))
 
 ... [Host]
-(import: java/lang/Object)
-(import: java/lang/String)
+(import: java/lang/Object
+  "[1]::[0]")
+
+(import: java/lang/String
+  "[1]::[0]")
 
 (syntax: (declare [codes (p.many s.local_symbol)])
   (|> codes
@@ -50,103 +53,103 @@
       in))
 
 (`` (import: org/objectweb/asm/Opcodes
-      ["[1]::[0]"
-       ("static" NOP int)
-
-       ... Conversion
-       (~~ (declare D2F D2I D2L
-                    F2D F2I F2L
-                    I2B I2C I2D I2F I2L I2S
-                    L2D L2F L2I))
-
-       ... Primitive
-       (~~ (declare T_BOOLEAN T_CHAR T_FLOAT T_DOUBLE
-                    T_BYTE T_SHORT T_INT T_LONG))
-
-       ... Class
-       (~~ (declare CHECKCAST NEW INSTANCEOF))
-       
-       ... Stack
-       (~~ (declare DUP DUP_X1 DUP_X2
-                    DUP2 DUP2_X1 DUP2_X2
-                    POP POP2
-                    SWAP))
-       
-       ... Jump
-       (~~ (declare IF_ICMPEQ IF_ICMPGT IF_ICMPLT
-                    IF_ICMPNE IF_ICMPGE IF_ICMPLE
-                    IF_ACMPEQ IF_ACMPNE IFNULL IFNONNULL
-                    IFEQ IFNE IFLT IFLE IFGT IFGE
-                    GOTO))
-
-       (~~ (declare BIPUSH SIPUSH))
-       (~~ (declare ICONST_M1 ICONST_0 ICONST_1 ICONST_2 ICONST_3 ICONST_4 ICONST_5
-                    LCONST_0 LCONST_1
-                    FCONST_0 FCONST_1 FCONST_2
-                    DCONST_0 DCONST_1))
-       ("static" ACONST_NULL int)
-       
-       ... Var
-       (~~ (declare IINC
-                    ILOAD LLOAD FLOAD DLOAD ALOAD
-                    ISTORE LSTORE FSTORE DSTORE ASTORE))
-       
-       ... Arithmetic
-       (~~ (declare IADD ISUB IMUL IDIV IREM INEG
-                    LADD LSUB LMUL LDIV LREM LNEG LCMP
-                    FADD FSUB FMUL FDIV FREM FNEG FCMPG FCMPL
-                    DADD DSUB DMUL DDIV DREM DNEG DCMPG DCMPL))
-       
-       ... Bit-wise
-       (~~ (declare IAND IOR IXOR ISHL ISHR IUSHR
-                    LAND LOR LXOR LSHL LSHR LUSHR))
-
-       ... Array
-       (~~ (declare ARRAYLENGTH NEWARRAY ANEWARRAY
-                    AALOAD AASTORE
-                    BALOAD BASTORE
-                    SALOAD SASTORE
-                    IALOAD IASTORE
-                    LALOAD LASTORE
-                    FALOAD FASTORE
-                    DALOAD DASTORE
-                    CALOAD CASTORE))
-       
-       ... Member
-       (~~ (declare GETSTATIC PUTSTATIC GETFIELD PUTFIELD
-                    INVOKESTATIC INVOKESPECIAL INVOKEVIRTUAL INVOKEINTERFACE))
-
-       ("static" ATHROW int)
-
-       ... Concurrency
-       (~~ (declare MONITORENTER MONITOREXIT))
-       
-       ... Return
-       (~~ (declare RETURN IRETURN LRETURN FRETURN DRETURN ARETURN))]
+      "[1]::[0]"
+      ("static" NOP int)
+
+      ... Conversion
+      (~~ (declare D2F D2I D2L
+                   F2D F2I F2L
+                   I2B I2C I2D I2F I2L I2S
+                   L2D L2F L2I))
+
+      ... Primitive
+      (~~ (declare T_BOOLEAN T_CHAR T_FLOAT T_DOUBLE
+                   T_BYTE T_SHORT T_INT T_LONG))
+
+      ... Class
+      (~~ (declare CHECKCAST NEW INSTANCEOF))
+      
+      ... Stack
+      (~~ (declare DUP DUP_X1 DUP_X2
+                   DUP2 DUP2_X1 DUP2_X2
+                   POP POP2
+                   SWAP))
+      
+      ... Jump
+      (~~ (declare IF_ICMPEQ IF_ICMPGT IF_ICMPLT
+                   IF_ICMPNE IF_ICMPGE IF_ICMPLE
+                   IF_ACMPEQ IF_ACMPNE IFNULL IFNONNULL
+                   IFEQ IFNE IFLT IFLE IFGT IFGE
+                   GOTO))
+
+      (~~ (declare BIPUSH SIPUSH))
+      (~~ (declare ICONST_M1 ICONST_0 ICONST_1 ICONST_2 ICONST_3 ICONST_4 ICONST_5
+                   LCONST_0 LCONST_1
+                   FCONST_0 FCONST_1 FCONST_2
+                   DCONST_0 DCONST_1))
+      ("static" ACONST_NULL int)
+      
+      ... Var
+      (~~ (declare IINC
+                   ILOAD LLOAD FLOAD DLOAD ALOAD
+                   ISTORE LSTORE FSTORE DSTORE ASTORE))
+      
+      ... Arithmetic
+      (~~ (declare IADD ISUB IMUL IDIV IREM INEG
+                   LADD LSUB LMUL LDIV LREM LNEG LCMP
+                   FADD FSUB FMUL FDIV FREM FNEG FCMPG FCMPL
+                   DADD DSUB DMUL DDIV DREM DNEG DCMPG DCMPL))
+      
+      ... Bit-wise
+      (~~ (declare IAND IOR IXOR ISHL ISHR IUSHR
+                   LAND LOR LXOR LSHL LSHR LUSHR))
+
+      ... Array
+      (~~ (declare ARRAYLENGTH NEWARRAY ANEWARRAY
+                   AALOAD AASTORE
+                   BALOAD BASTORE
+                   SALOAD SASTORE
+                   IALOAD IASTORE
+                   LALOAD LASTORE
+                   FALOAD FASTORE
+                   DALOAD DASTORE
+                   CALOAD CASTORE))
+      
+      ... Member
+      (~~ (declare GETSTATIC PUTSTATIC GETFIELD PUTFIELD
+                   INVOKESTATIC INVOKESPECIAL INVOKEVIRTUAL INVOKEINTERFACE))
+
+      ("static" ATHROW int)
+
+      ... Concurrency
+      (~~ (declare MONITORENTER MONITOREXIT))
+      
+      ... Return
+      (~~ (declare RETURN IRETURN LRETURN FRETURN DRETURN ARETURN))
       ))
 
 (import: org/objectweb/asm/Label
-  ["[1]::[0]"
-   (new [])])
+  "[1]::[0]"
+  (new []))
 
 (import: org/objectweb/asm/MethodVisitor
-  ["[1]::[0]"
-   (visitCode [] void)
-   (visitMaxs [int int] void)
-   (visitEnd [] void)
-   (visitInsn [int] void)
-   (visitLdcInsn [java/lang/Object] void)
-   (visitFieldInsn [int java/lang/String java/lang/String java/lang/String] void)
-   (visitTypeInsn [int java/lang/String] void)
-   (visitVarInsn [int int] void)
-   (visitIntInsn [int int] void)
-   (visitMethodInsn [int java/lang/String java/lang/String java/lang/String boolean] void)
-   (visitLabel [org/objectweb/asm/Label] void)
-   (visitJumpInsn [int org/objectweb/asm/Label] void)
-   (visitTryCatchBlock [org/objectweb/asm/Label org/objectweb/asm/Label org/objectweb/asm/Label java/lang/String] void)
-   (visitLookupSwitchInsn [org/objectweb/asm/Label [int] [org/objectweb/asm/Label]] void)
-   (visitTableSwitchInsn [int int org/objectweb/asm/Label [org/objectweb/asm/Label]] void)
-   ])
+  "[1]::[0]"
+  (visitCode [] void)
+  (visitMaxs [int int] void)
+  (visitEnd [] void)
+  (visitInsn [int] void)
+  (visitLdcInsn [java/lang/Object] void)
+  (visitFieldInsn [int java/lang/String java/lang/String java/lang/String] void)
+  (visitTypeInsn [int java/lang/String] void)
+  (visitVarInsn [int int] void)
+  (visitIntInsn [int int] void)
+  (visitMethodInsn [int java/lang/String java/lang/String java/lang/String boolean] void)
+  (visitLabel [org/objectweb/asm/Label] void)
+  (visitJumpInsn [int org/objectweb/asm/Label] void)
+  (visitTryCatchBlock [org/objectweb/asm/Label org/objectweb/asm/Label org/objectweb/asm/Label java/lang/String] void)
+  (visitLookupSwitchInsn [org/objectweb/asm/Label [int] [org/objectweb/asm/Label]] void)
+  (visitTableSwitchInsn [int int org/objectweb/asm/Label [org/objectweb/asm/Label]] void)
+  )
 
 ... [Insts]
 (def: .public make_label
diff --git a/lux-jvm/source/luxc/lang/translation/jvm.lux b/lux-jvm/source/luxc/lang/translation/jvm.lux
index e2bd46f5d..e65d58052 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm.lux
@@ -42,18 +42,19 @@
  )
 
 (import: java/lang/reflect/Field
-  ["[1]::[0]"
-   (get ["?" java/lang/Object] "try" "?" java/lang/Object)])
+  "[1]::[0]"
+  (get ["?" java/lang/Object] "try" "?" java/lang/Object))
 
 (import: (java/lang/Class a)
-  ["[1]::[0]"
-   (getField [java/lang/String] "try" java/lang/reflect/Field)])
+  "[1]::[0]"
+  (getField [java/lang/String] "try" java/lang/reflect/Field))
 
 (import: java/lang/Object
-  ["[1]::[0]"
-   (getClass [] (java/lang/Class java/lang/Object))])
+  "[1]::[0]"
+  (getClass [] (java/lang/Class java/lang/Object)))
 
-(import: java/lang/ClassLoader)
+(import: java/lang/ClassLoader
+  "[1]::[0]")
 
 (type: .public ByteCode Binary)
 
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
index 0f2b64f9f..016639f2e 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/primitive.lux
@@ -1,21 +1,21 @@
 (.using
-  [library
-   [lux {"-" i64}
-    ["[0]" ffi {"+" import:}]
-    [math
-     [number
-      ["i" int]]]
-    [target
-     [jvm
-      ["[0]" type]]]
-    [tool
-     [compiler
-      [phase ("operation@[0]" monad)]]]]]
-  [luxc
-   [lang
-    [host
-     ["[0]" jvm {"+" Inst Operation}
-      ["_" inst]]]]])
+ [library
+  [lux {"-" i64}
+   ["[0]" ffi {"+" import:}]
+   [math
+    [number
+     ["i" int]]]
+   [target
+    [jvm
+     ["[0]" type]]]
+   [tool
+    [compiler
+     [phase ("operation@[0]" monad)]]]]]
+ [luxc
+  [lang
+   [host
+    ["[0]" jvm {"+" Inst Operation}
+     ["_" inst]]]]])
 
 (def: .public bit
   (-> Bit (Operation Inst))
@@ -24,14 +24,14 @@
       (operation@in (_.GETSTATIC Boolean (if value "TRUE" "FALSE") Boolean)))))
 
 (import: java/lang/Byte
-  ["[1]::[0]"
-   ("static" MAX_VALUE byte)
-   ("static" MIN_VALUE byte)])
+  "[1]::[0]"
+  ("static" MAX_VALUE byte)
+  ("static" MIN_VALUE byte))
 
 (import: java/lang/Short
-  ["[1]::[0]"
-   ("static" MAX_VALUE short)
-   ("static" MIN_VALUE short)])
+  "[1]::[0]"
+  ("static" MAX_VALUE short)
+  ("static" MIN_VALUE short))
 
 (def: .public (i64 value)
   (-> (I64 Any) (Operation Inst))
@@ -67,8 +67,8 @@
       (operation@in (|>> constantI (_.wrap type.long))))))
 
 (import: java/lang/Double
-  ["[1]::[0]"
-   ("static" doubleToRawLongBits "manual" [double] int)])
+  "[1]::[0]"
+  ("static" doubleToRawLongBits "manual" [double] int))
 
 (def: d0-bits
   Int
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
index 9c8b8b52a..e7604be15 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/structure.lux
@@ -1,41 +1,41 @@
 (.using
-  [library
-   [lux {"-" Type Primitive}
-    ["[0]" ffi {"+" import:}]
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" exception {"+" exception:}]]
-    [data
-     [text
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" list]]]
-    [math
-     [number
-      ["n" nat]
-      ["i" int]]]
-    [target
-     [jvm
-      ["[0]" type {"+" Type}
-       ["[0]" category {"+" Void Value Return Primitive Object Class Array Var Parameter Method}]
-       ["[0]" descriptor {"+" Descriptor}]
-       ["[0]" signature {"+" Signature}]]]]
-    [tool
-     [compiler
-      ["[0]" phase]
-      [meta
-       [archive {"+" Archive}]]
-      [language
-       [lux
-        [synthesis {"+" Synthesis}]]]]]]]
-  [luxc
-   [lang
-    [host
-     [jvm {"+" Inst Operation Phase Generator}
-      ["_" inst]]]]]
-  ["[0]" //
-   ["[1][0]" runtime]])
+ [library
+  [lux {"-" Type Primitive}
+   ["[0]" ffi {"+" import:}]
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" exception {"+" exception:}]]
+   [data
+    [text
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" list]]]
+   [math
+    [number
+     ["n" nat]
+     ["i" int]]]
+   [target
+    [jvm
+     ["[0]" type {"+" Type}
+      ["[0]" category {"+" Void Value Return Primitive Object Class Array Var Parameter Method}]
+      ["[0]" descriptor {"+" Descriptor}]
+      ["[0]" signature {"+" Signature}]]]]
+   [tool
+    [compiler
+     ["[0]" phase]
+     [meta
+      [archive {"+" Archive}]]
+     [language
+      [lux
+       [synthesis {"+" Synthesis}]]]]]]]
+ [luxc
+  [lang
+   [host
+    [jvm {"+" Inst Operation Phase Generator}
+     ["_" inst]]]]]
+ ["[0]" //
+  ["[1][0]" runtime]])
 
 (exception: .public (not_a_tuple [size Nat])
   (exception.report
@@ -63,14 +63,14 @@
              membersI))))
 
 (import: java/lang/Byte
-  ["[1]::[0]"
-   ("static" MAX_VALUE byte)
-   ("static" MIN_VALUE byte)])
+  "[1]::[0]"
+  ("static" MAX_VALUE byte)
+  ("static" MIN_VALUE byte))
 
 (import: java/lang/Short
-  ["[1]::[0]"
-   ("static" MAX_VALUE short)
-   ("static" MIN_VALUE short)])
+  "[1]::[0]"
+  ("static" MAX_VALUE short)
+  ("static" MIN_VALUE short))
 
 (def: .public (tagI lefts right?)
   (-> Nat Bit Inst)