1 files changed, 30 insertions, 30 deletions
diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux
index 8447c56de..cd459643a 100644
--- a/stdlib/source/library/lux/target/jvm/class.lux
+++ b/stdlib/source/library/lux/target/jvm/class.lux
@@ -58,18 +58,18 @@
 
 (def: .public equivalence
   (Equivalence Class)
-  ($_ product.equivalence
-      //unsigned.equivalence
-      //unsigned.equivalence
-      //unsigned.equivalence
-      //pool.equivalence
-      //modifier.equivalence
-      //index.equivalence
-      //index.equivalence
-      (sequence.equivalence //index.equivalence)
-      (sequence.equivalence //field.equivalence)
-      (sequence.equivalence //method.equivalence)
-      (sequence.equivalence //attribute.equivalence)))
+  (all product.equivalence
+       //unsigned.equivalence
+       //unsigned.equivalence
+       //unsigned.equivalence
+       //pool.equivalence
+       //modifier.equivalence
+       //index.equivalence
+       //index.equivalence
+       (sequence.equivalence //index.equivalence)
+       (sequence.equivalence //field.equivalence)
+       (sequence.equivalence //method.equivalence)
+       (sequence.equivalence //attribute.equivalence)))
 
 (def: (install_classes this super interfaces)
   (-> Internal Internal (List Internal)
@@ -128,23 +128,23 @@
 
 (def: .public (writer class)
   (Writer Class)
-  (`` ($_ binaryF#composite
-          (~~ (template [<writer> <slot>]
-                [(<writer> (the <slot> class))]
+  (`` (all binaryF#composite
+           (~~ (template [<writer> <slot>]
+                 [(<writer> (the <slot> class))]
 
-                [//magic.writer #magic]
-                [//version.writer #minor_version]
-                [//version.writer #major_version]
-                [//pool.writer #constant_pool]
-                [//modifier.writer #modifier]
-                [//index.writer #this]
-                [//index.writer #super]))
-          (~~ (template [<writer> <slot>]
-                [((binaryF.sequence_16 <writer>) (the <slot> class))]
+                 [//magic.writer #magic]
+                 [//version.writer #minor_version]
+                 [//version.writer #major_version]
+                 [//pool.writer #constant_pool]
+                 [//modifier.writer #modifier]
+                 [//index.writer #this]
+                 [//index.writer #super]))
+           (~~ (template [<writer> <slot>]
+                 [((binaryF.sequence_16 <writer>) (the <slot> class))]
 
-                [//index.writer #interfaces]
-                [//field.writer #fields]
-                [//method.writer #methods]
-                [//attribute.writer #attributes]
-                ))
-          )))
+                 [//index.writer #interfaces]
+                 [//field.writer #fields]
+                 [//method.writer #methods]
+                 [//attribute.writer #attributes]
+                 ))
+           )))