3 files changed, 46 insertions, 46 deletions
diff --git a/lux-jvm/source/luxc/lang/directive/jvm.lux b/lux-jvm/source/luxc/lang/directive/jvm.lux
index 19e98ae20..323c337d5 100644
--- a/lux-jvm/source/luxc/lang/directive/jvm.lux
+++ b/lux-jvm/source/luxc/lang/directive/jvm.lux
@@ -5,7 +5,7 @@
    [abstract
     ["[0]" monad {"+" do}]]
    [control
-    [pipe {"+" case>}]
+    ["[0]" pipe]
     ["[0]" try {"+" Try}]
     ["<>" parser
      ["<[0]>" code {"+" Parser}]
@@ -857,16 +857,16 @@
 
 (def: visibility
   (-> ffi.Privacy jvm.Visibility)
-  (|>> (case> {ffi.#PublicP} {jvm.#Public}
-              {ffi.#PrivateP} {jvm.#Private}
-              {ffi.#ProtectedP} {jvm.#Protected}
-              {ffi.#DefaultP} {jvm.#Default})))
+  (|>> (pipe.case {ffi.#PublicP} {jvm.#Public}
+         {ffi.#PrivateP} {jvm.#Private}
+         {ffi.#ProtectedP} {jvm.#Protected}
+         {ffi.#DefaultP} {jvm.#Default})))
 
 (def: field_config
   (-> ffi.State jvm.Field_Config)
-  (|>> (case> {ffi.#VolatileS} jvm.volatileF
-              {ffi.#FinalS} jvm.finalF
-              {ffi.#DefaultS} jvm.noneF)))
+  (|>> (pipe.case {ffi.#VolatileS} jvm.volatileF
+         {ffi.#FinalS} jvm.finalF
+         {ffi.#DefaultS} jvm.noneF)))
 
 (def: (field_header [name privacy state annotations type])
   (-> Field jvm.Def)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/case.lux b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
index 94a3deb05..9a5172966 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/case.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/case.lux
@@ -1,39 +1,39 @@
 (.using
-  [library
-   [lux {"-" Type Label Primitive if exec let case}
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" function]
-     ["ex" exception {"+" exception:}]]
-    [data
-     [collection
-      ["[0]" list ("[1]@[0]" mix)]]]
-    [math
-     [number
-      ["n" nat]]]
-    [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 ("operation@[0]" monad)]
-      [meta
-       [archive {"+" Archive}]]
-      [language
-       [lux
-        ["[0]" synthesis {"+" Path Synthesis}]]]]]]]
-  [luxc
-   [lang
-    [host
-     ["$" jvm {"+" Label Inst Operation Phase Generator}
-      ["_" inst]]]]]
-  ["[0]" //
-   ["[0]" runtime]
-   ["[0]" structure]])
+ [library
+  [lux {"-" Type Label Primitive if exec let case}
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" function]
+    ["ex" exception {"+" exception:}]]
+   [data
+    [collection
+     ["[0]" list ("[1]@[0]" mix)]]]
+   [math
+    [number
+     ["n" nat]]]
+   [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 ("operation@[0]" monad)]
+     [meta
+      [archive {"+" Archive}]]
+     [language
+      [lux
+       ["[0]" synthesis {"+" Path Synthesis}]]]]]]]
+ [luxc
+  [lang
+   [host
+    ["$" jvm {"+" Label Inst Operation Phase Generator}
+     ["_" inst]]]]]
+ ["[0]" //
+  ["[0]" runtime]
+  ["[0]" structure]])
 
 (def: (pop_altI stack_depth)
   (-> Nat Inst)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index 6c0e29730..92ca0e16c 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -5,7 +5,7 @@
     ["[0]" monad {"+" do}]
     ["[0]" enum]]
    [control
-    [pipe {"+" when> new>}]
+    ["[0]" pipe]
     ["[0]" function]]
    [data
     ["[0]" product]
@@ -217,8 +217,8 @@
                                   (cond (i.= over_extent (.int stage))
                                         (|>> (_.label @label)
                                              (_.ALOAD 0)
-                                             (when> [(new> (n.> 0 stage) [])]
-                                                    [(_.INVOKEVIRTUAL class "reset" (reset_method class))])
+                                             (pipe.when [(pipe.new (n.> 0 stage) [])]
+                                                        [(_.INVOKEVIRTUAL class "reset" (reset_method class))])
                                              load_partialsI
                                              (inputsI 1 apply_arity)
                                              (_.INVOKEVIRTUAL class "impl" (implementation_method function_arity))