1 files changed, 51 insertions, 46 deletions
diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux
index 834b2ff38..91571edaf 100644
--- a/lux-cl/source/program.lux
+++ b/lux-cl/source/program.lux
@@ -63,89 +63,94 @@
    ["[1][0]" cli]
    ["[1][0]" static]]])
 
-(ffi.import: java/lang/String)
+(ffi.import: java/lang/String
+  "[1]::[0]")
 
 (ffi.import: (java/lang/Class a)
-  ["[1]::[0]"
-   ("static" forName [java/lang/String] "try" (java/lang/Class java/lang/Object))])
+  "[1]::[0]"
+  ("static" forName [java/lang/String] "try" (java/lang/Class java/lang/Object)))
 
 (ffi.import: java/lang/Object
-  ["[1]::[0]"
-   (toString [] java/lang/String)
-   (getClass [] (java/lang/Class java/lang/Object))])
+  "[1]::[0]"
+  (toString [] java/lang/String)
+  (getClass [] (java/lang/Class java/lang/Object)))
 
 (ffi.import: java/lang/Long
-  ["[1]::[0]"
-   (intValue [] java/lang/Integer)])
+  "[1]::[0]"
+  (intValue [] java/lang/Integer))
 
 (ffi.import: java/lang/Integer
-  ["[1]::[0]"
-   (longValue [] long)])
+  "[1]::[0]"
+  (longValue [] long))
 
 (ffi.import: java/lang/Number
-  ["[1]::[0]"
-   (intValue [] java/lang/Integer)
-   (longValue [] long)
-   (doubleValue [] double)])
+  "[1]::[0]"
+  (intValue [] java/lang/Integer)
+  (longValue [] long)
+  (doubleValue [] double))
 
 (ffi.import: org/armedbear/lisp/LispObject
-  ["[1]::[0]"
-   (length [] int)
-   (NTH [int] org/armedbear/lisp/LispObject)
-   (SVREF [int] org/armedbear/lisp/LispObject)
-   (elt [int] org/armedbear/lisp/LispObject)
-   (execute [org/armedbear/lisp/LispObject org/armedbear/lisp/LispObject] "try" org/armedbear/lisp/LispObject)])
+  "[1]::[0]"
+  (length [] int)
+  (NTH [int] org/armedbear/lisp/LispObject)
+  (SVREF [int] org/armedbear/lisp/LispObject)
+  (elt [int] org/armedbear/lisp/LispObject)
+  (execute [org/armedbear/lisp/LispObject org/armedbear/lisp/LispObject] "try" org/armedbear/lisp/LispObject))
 
 ... The org/armedbear/lisp/Interpreter must be imported before the
 ... other ones, because there is an order dependency in their static initialization.
 (ffi.import: org/armedbear/lisp/Interpreter
-  ["[1]::[0]"
-   ("static" getInstance [] org/armedbear/lisp/Interpreter)
-   ("static" createInstance [] "?" org/armedbear/lisp/Interpreter)
-   (eval [java/lang/String] "try" org/armedbear/lisp/LispObject)])
+  "[1]::[0]"
+  ("static" getInstance [] org/armedbear/lisp/Interpreter)
+  ("static" createInstance [] "?" org/armedbear/lisp/Interpreter)
+  (eval [java/lang/String] "try" org/armedbear/lisp/LispObject))
 
 (ffi.import: org/armedbear/lisp/Symbol
-  ["[1]::[0]"
-   ("static" T org/armedbear/lisp/Symbol)])
+  "[1]::[0]"
+  ("static" T org/armedbear/lisp/Symbol))
 
 (ffi.import: org/armedbear/lisp/DoubleFloat
-  ["[1]::[0]"
-   (new [double])
-   (doubleValue [] double)])
+  "[1]::[0]"
+  (new [double])
+  (doubleValue [] double))
 
 (ffi.import: org/armedbear/lisp/SimpleString
-  ["[1]::[0]"
-   (new [java/lang/String])
-   (getStringValue [] java/lang/String)])
+  "[1]::[0]"
+  (new [java/lang/String])
+  (getStringValue [] java/lang/String))
 
-(ffi.import: org/armedbear/lisp/LispInteger)
+(ffi.import: org/armedbear/lisp/LispInteger
+  "[1]::[0]")
 
 (ffi.import: org/armedbear/lisp/Bignum
-  ["[1]::[0]"
-   (longValue [] long)
-   ("static" getInstance [long] org/armedbear/lisp/LispInteger)])
+  "[1]::[0]"
+  (longValue [] long)
+  ("static" getInstance [long] org/armedbear/lisp/LispInteger))
 
 (ffi.import: org/armedbear/lisp/Fixnum
-  ["[1]::[0]"
-   (longValue [] long)
-   ("static" getInstance [int] org/armedbear/lisp/Fixnum)])
+  "[1]::[0]"
+  (longValue [] long)
+  ("static" getInstance [int] org/armedbear/lisp/Fixnum))
 
 (ffi.import: org/armedbear/lisp/Nil
-  ["[1]::[0]"
-   ("static" NIL org/armedbear/lisp/Symbol)])
+  "[1]::[0]"
+  ("static" NIL org/armedbear/lisp/Symbol))
 
-(ffi.import: org/armedbear/lisp/SimpleVector)
+(ffi.import: org/armedbear/lisp/SimpleVector
+  "[1]::[0]")
 
-(ffi.import: org/armedbear/lisp/Cons)
+(ffi.import: org/armedbear/lisp/Cons
+  "[1]::[0]")
 
-(ffi.import: org/armedbear/lisp/Closure)
+(ffi.import: org/armedbear/lisp/Closure
+  "[1]::[0]")
 
 (ffi.interface: LuxADT
   (getValue [] java/lang/Object))
 
 (ffi.import: program/LuxADT
-  ["[1]::[0]"
-   (getValue [] java/lang/Object)])
+  "[1]::[0]"
+  (getValue [] java/lang/Object))
 
 (template [<name>]
   [(exception: (<name> [object java/lang/Object])