From adc95b417a54b80d9202c54f9ffcf1f62ff816fd Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Tue, 19 Aug 2014 21:39:48 -0400
Subject: [PATCH] Adapt jet layer 3 to new noun system.

---
 Makefile       |  5 ++++-
 f/meme.c       |  2 +-
 gen164/3/bex.c | 19 ++++++++--------
 gen164/3/can.c | 60 ++++++++++++++++++++++++--------------------------
 gen164/3/cap.c | 22 +++++++++---------
 gen164/3/cat.c | 40 ++++++++++++++++-----------------
 gen164/3/con.c | 38 +++++++++++++++-----------------
 gen164/3/cut.c | 46 +++++++++++++++++++-------------------
 gen164/3/dis.c | 36 ++++++++++++++----------------
 gen164/3/dor.c | 26 +++++++++++-----------
 gen164/3/end.c | 42 +++++++++++++++++------------------
 gen164/3/gor.c | 18 +++++++--------
 gen164/3/hor.c | 30 ++++++++++++-------------
 gen164/3/lsh.c | 44 ++++++++++++++++++------------------
 gen164/3/mas.c | 30 ++++++++++++-------------
 gen164/3/met.c | 30 ++++++++++++-------------
 gen164/3/mix.c | 36 ++++++++++++++----------------
 gen164/3/mug.c |  8 +++----
 gen164/3/peg.c | 36 +++++++++++++++---------------
 gen164/3/po.c  | 26 +++++++++++-----------
 gen164/3/rap.c | 60 ++++++++++++++++++++++++--------------------------
 gen164/3/rip.c | 48 +++++++++++++++++++---------------------
 gen164/3/rsh.c | 40 ++++++++++++++++-----------------
 gen164/3/vor.c | 18 +++++++--------
 24 files changed, 371 insertions(+), 389 deletions(-)

diff --git a/Makefile b/Makefile
index 994724e0e..4bcae0b04 100644
--- a/Makefile
+++ b/Makefile
@@ -330,7 +330,10 @@ $(BIN)/vere: $(LIBCRE) $(VERE_OFILES) $(LIBUV) $(LIBRE2) $(LIBED25519) $(BPT_O)
 
 meme: $(BIN)/meme
 
-$(BIN)/meme: f/meme.o $(J164_1_OFILES) $(J164_2_OFILES)
+$(BIN)/meme: f/meme.o \
+             $(J164_1_OFILES) \
+             $(J164_2_OFILES) \
+	     $(J164_3_OFILES)
 	$(CC) -g $< -lgmp -o $@
 
 tags:
diff --git a/f/meme.c b/f/meme.c
index 2a7aa579a..a365fb670 100644
--- a/f/meme.c
+++ b/f/meme.c
@@ -2587,7 +2587,7 @@ u2_cr_bytes(c3_w    a_w,
 
   c3_assert(u2_none != d);
 
-  /* Efficiency: don't call u2_cr_word().
+  /* Efficiency: don't call u2_cr_byte().
   */
   for ( i_w = 0; i_w < b_w; i_w++ ) {
     c_y[i_w] = u2_cr_byte((a_w + i_w), d);
diff --git a/gen164/3/bex.c b/gen164/3/bex.c
index b5d211006..009f93a2f 100644
--- a/gen164/3/bex.c
+++ b/gen164/3/bex.c
@@ -8,33 +8,32 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, bex)(u2_wire wir_r,
-                   u2_atom a)                                     //  retain
+  j2_mbc(Pt3, bex)(u2_atom a)                                     //  retain
   {
     mpz_t a_mp;
 
-    if ( !u2_fly_is_cat(a) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    if ( u2_ne(u2_co_is_cat(a)) ) {
+      return u2_cm_bail(c3__fail);
     }
     else {
       mpz_init_set_ui(a_mp, 1);
       mpz_mul_2exp(a_mp, a_mp, a);
 
-      return u2_rl_mp(wir_r, a_mp);
+      return u2_ci_mp(a_mp);
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, bex)(u2_wire wir_r,
+  j2_mb(Pt3, bex)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a;
 
-    if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) ||
-         (u2_no == u2_stud(a)) )
+    if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ||
+         (u2_no == u2ud(a)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, bex)(wir_r, a);
+      return j2_mbc(Pt3, bex)(a);
     }
   }
 
diff --git a/gen164/3/can.c b/gen164/3/can.c
index 80c604453..40828177f 100644
--- a/gen164/3/can.c
+++ b/gen164/3/can.c
@@ -8,17 +8,16 @@
 /* functions
 */
   u2_noun                                                         //  transfer
-  j2_mbc(Pt3, can)(u2_wire wir_r,
-                   u2_atom a,                                     //  retain
+  j2_mbc(Pt3, can)(u2_atom a,                                     //  retain
                    u2_noun b)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      return u2_cm_bail(c3__fail);
     }
     else {
-      c3_g   a_g = a;
-      c3_w   tot_w = 0;
-      u2_ray sal_r;
+      c3_g  a_g = a;
+      c3_w  tot_w = 0;
+      c3_w* sal_w;
 
       /* Measure and validate the slab required.
       */
@@ -28,27 +27,27 @@
         while ( 1 ) {
           u2_noun i_cab, pi_cab, qi_cab;
 
-          if ( _0 == cab ) {
+          if ( 0 == cab ) {
             break;
           }
-          if ( (u2_no == u2_dust(cab)) ||
-               (u2_no == u2_dust(i_cab = u2_h(cab))) ||
-               !(u2_fly_is_cat(pi_cab = u2_h(i_cab))) ||
-               u2_no == u2_stud(qi_cab = u2_t(i_cab)) )
+          if ( (u2_no == u2du(cab)) ||
+               (u2_no == u2du(i_cab = u2h(cab))) ||
+               u2_ne(u2_co_is_cat(pi_cab = u2h(i_cab))) ||
+               u2_no == u2ud(qi_cab = u2t(i_cab)) )
           {
-            return u2_bl_bail(wir_r, c3__fail);
+            return u2_cm_bail(c3__fail);
           }
           else if ( (tot_w + pi_cab) < tot_w ) {
-            return u2_bl_bail(wir_r, c3__fail);
+            return u2_cm_bail(c3__fail);
           }
           tot_w += pi_cab;
-          cab = u2_t(cab);
+          cab = u2t(cab);
         }
         if ( 0 == tot_w ) {
-          return _0;
+          return 0;
         }
-        if ( 0 == (sal_r = u2_rl_slaq(wir_r, a_g, tot_w)) ) {
-          return u2_bl_bail(wir_r, c3__fail);
+        if ( 0 == (sal_w = u2_ca_slaq(a_g, tot_w)) ) {
+          return u2_cm_bail(c3__fail);
         }
       }
 
@@ -58,31 +57,30 @@
         u2_noun cab = b;
         c3_w    pos_w = 0;
 
-        while ( _0 != cab ) {
-          u2_noun i_cab = u2_h(cab);
-          u2_atom pi_cab = u2_h(i_cab);
-          u2_atom qi_cab = u2_t(i_cab);
+        while ( 0 != cab ) {
+          u2_noun i_cab = u2h(cab);
+          u2_atom pi_cab = u2h(i_cab);
+          u2_atom qi_cab = u2t(i_cab);
 
-          u2_chop(a_g, 0, pi_cab, pos_w, sal_r, qi_cab);
+          u2_cr_chop(a_g, 0, pi_cab, pos_w, sal_w, qi_cab);
           pos_w += pi_cab;
-          cab = u2_t(cab);
+          cab = u2t(cab);
         }
       }
-      return u2_rl_malt(wir_r, sal_r);
+      return u2_ca_malt(sal_w);
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, can)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, can)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
-         (u2_no == u2_stud(a)) )
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
+         (u2_no == u2ud(a)) )
     {
-      return u2_bl_bail(wir_r, c3__fail);
+      return u2_cm_bail(c3__fail);
     } else {
-      return j2_mbc(Pt3, can)(wir_r, a, b);
+      return j2_mbc(Pt3, can)(a, b);
     }
   }
 
diff --git a/gen164/3/cap.c b/gen164/3/cap.c
index f6b983a6b..00daa0941 100644
--- a/gen164/3/cap.c
+++ b/gen164/3/cap.c
@@ -8,32 +8,32 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, cap)(u2_wire wir_r,
+  j2_mbc(Pt3, cap)(
                    u2_atom a)                                     //  retain
   {
-    c3_w met_w = u2_met(0, a);
+    c3_w met_w = u2_cr_met(0, a);
 
     if ( met_w < 2 ) {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     }
-    else if ( (1 == u2_bit((met_w - 2), a)) ) {
-      return _3;
+    else if ( (1 == u2_cr_bit((met_w - 2), a)) ) {
+      return 3;
     } else {
-      return _2;
+      return 2;
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, cap)(u2_wire wir_r,
+  j2_mb(Pt3, cap)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a;
 
-    if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) ||
-         (u2_no == u2_stud(a)) )
+    if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ||
+         (u2_no == u2ud(a)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, cap)(wir_r, a);
+      return j2_mbc(Pt3, cap)(a);
     }
   }
 
diff --git a/gen164/3/cat.c b/gen164/3/cat.c
index 87c198b3d..81a6aa14e 100644
--- a/gen164/3/cat.c
+++ b/gen164/3/cat.c
@@ -8,54 +8,52 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, cat)(u2_wire wir_r,
-                   u2_atom a,                                     //  retain
+  j2_mbc(Pt3, cat)(u2_atom a,                                     //  retain
                    u2_atom b,                                     //  retain
                    u2_atom c)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      return u2_cm_bail(c3__fail);
     }
     else {
       c3_g   a_g = a;
-      c3_w   lew_w = u2_met(a_g, b);
-      c3_w   ler_w = u2_met(a_g, c);
+      c3_w   lew_w = u2_cr_met(a_g, b);
+      c3_w   ler_w = u2_cr_met(a_g, c);
       c3_w   all_w = (lew_w + ler_w);
 
       if ( 0 == all_w ) {
         return 0;
       } else {
-        u2_ray sal_r = u2_rl_slaq(wir_r, a_g, all_w);
+        c3_w* sal_w = u2_ca_slaq(a_g, all_w);
 
-        if ( 0 == sal_r ) {
-          return u2_bl_bail(wir_r, c3__fail);
+        if ( 0 == sal_w ) {
+          return u2_cm_bail(c3__fail);
         }
         else {
-          u2_chop(a_g, 0, lew_w, 0, sal_r, b);
-          u2_chop(a_g, 0, ler_w, lew_w, sal_r, c);
+          u2_cr_chop(a_g, 0, lew_w, 0, sal_w, b);
+          u2_cr_chop(a_g, 0, ler_w, lew_w, sal_w, c);
         }
-        // return u2_rl_moot(wir_r, sal_r);
-        return u2_rl_malt(wir_r, sal_r);
+        // return u2_ca_moot(sal_w);
+        return u2_ca_malt(sal_w);
       }
     }
   }
 
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, cat)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, cat)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a,
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
                                 u2_cv_sam_6, &b,
                                 u2_cv_sam_7, &c, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) ||
-         (u2_no == u2_stud(c)) )
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) ||
+         (u2_no == u2ud(c)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, cat)(wir_r, a, b, c);
+      return j2_mbc(Pt3, cat)(a, b, c);
     }
   }
 
diff --git a/gen164/3/con.c b/gen164/3/con.c
index 4663118b8..6c02a0a32 100644
--- a/gen164/3/con.c
+++ b/gen164/3/con.c
@@ -8,48 +8,46 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, con)(u2_wire wir_r,
-                   u2_atom a,                                     //  retain
+  j2_mbc(Pt3, con)(u2_atom a,                                     //  retain
                    u2_atom b)                                     //  retain
   {
-    c3_w lna_w = u2_met(5, a);
-    c3_w lnb_w = u2_met(5, b);
+    c3_w lna_w = u2_cr_met(5, a);
+    c3_w lnb_w = u2_cr_met(5, b);
 
     if ( (lna_w == 0) && (lnb_w == 0) ) {
-      return _0;
+      return 0;
     } else {
-      c3_w   len_w = c3_max(lna_w, lnb_w);
-      u2_ray sal_r = u2_rl_slab(wir_r, len_w);
+      c3_w  len_w = c3_max(lna_w, lnb_w);
+      c3_w* sal_w = u2_ca_slab(len_w);
 
-      if ( 0 == sal_r ) {
-        return u2_bl_bail(wir_r, c3__fail);
+      if ( 0 == sal_w ) {
+        return u2_cm_bail(c3__fail);
       }
       else {
         c3_w i_w;
 
-        u2_chop(5, 0, lna_w, 0, sal_r, a);
+        u2_cr_chop(5, 0, lna_w, 0, sal_w, a);
 
         for ( i_w = 0; i_w < lnb_w; i_w++ ) {
-          *u2_at_ray(sal_r + i_w) |= u2_atom_word(b, i_w);
+          sal_w[i_w] |= u2_cr_word(i_w, b);
         }
-        // return u2_rl_moot(wir_r, sal_r);
-        return u2_rl_malt(wir_r, sal_r);
+        // return u2_ca_moot(sal_w);
+        return u2_ca_malt(sal_w);
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, con)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, con)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) )
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, con)(wir_r, a, b);
+      return j2_mbc(Pt3, con)(a, b);
     }
   }
 
diff --git a/gen164/3/cut.c b/gen164/3/cut.c
index 4a1623fc1..514d32b8e 100644
--- a/gen164/3/cut.c
+++ b/gen164/3/cut.c
@@ -8,19 +8,19 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, cut)(u2_wire wir_r,
+  j2_mbc(Pt3, cut)(
                    u2_atom a,                                     //  retain
                    u2_atom b,                                     //  retain
                    u2_atom c,                                     //  retain
                    u2_atom d)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      return u2_cm_bail(c3__fail);
     }
-    if ( !u2_fly_is_cat(b) ) {
-      return _0;
+    if ( u2_ne(u2_co_is_cat(b)) ) {
+      return 0;
     }
-    if ( !u2_fly_is_cat(c) ) {
+    if ( u2_ne(u2_co_is_cat(c)) ) {
       c = 0x7fffffff;
     }
 
@@ -28,47 +28,47 @@
       c3_g a_g   = a;
       c3_w b_w   = b;
       c3_w c_w   = c;
-      c3_w len_w = u2_met(a_g, d);
+      c3_w len_w = u2_cr_met(a_g, d);
 
-      if ( (_0 == c_w) || (b_w >= len_w) ) {
-        return _0;
+      if ( (0 == c_w) || (b_w >= len_w) ) {
+        return 0;
       }
       if ( b_w + c_w > len_w ) {
         c_w = (len_w - b_w);
       }
       if ( (b_w == 0) && (c_w == len_w) ) {
-        return u2_rx(wir_r, d);
+        return u2k(d);
       }
       else {
-        u2_ray sal_r = u2_rl_slaq(wir_r, a_g, c_w);
+        c3_w* sal_w = u2_ca_slaq(a_g, c_w);
 
-        if ( 0 == sal_r ) {
-          return u2_bl_bail(wir_r, c3__fail);
+        if ( 0 == sal_w ) {
+          return u2_cm_bail(c3__fail);
         }
-        u2_chop(a_g, b_w, c_w, 0, sal_r, d);
+        u2_cr_chop(a_g, b_w, c_w, 0, sal_w, d);
 
-        return u2_rl_malt(wir_r, sal_r);
+        return u2_ca_malt(sal_w);
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, cut)(u2_wire wir_r,
+  j2_mb(Pt3, cut)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c, d;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2,  &a,
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2,  &a,
                                 u2_cv_sam_12, &b,
                                 u2_cv_sam_13, &c,
                                 u2_cv_sam_7,  &d, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) ||
-         (u2_no == u2_stud(c)) ||
-         (u2_no == u2_stud(d)) )
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) ||
+         (u2_no == u2ud(c)) ||
+         (u2_no == u2ud(d)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, cut)(wir_r, a, b, c, d);
+      return j2_mbc(Pt3, cut)(a, b, c, d);
     }
   }
 
diff --git a/gen164/3/dis.c b/gen164/3/dis.c
index 23eaed901..2079140db 100644
--- a/gen164/3/dis.c
+++ b/gen164/3/dis.c
@@ -8,47 +8,45 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, dis)(u2_wire wir_r,
-                   u2_atom a,                                     //  retain
+  j2_mbc(Pt3, dis)(u2_atom a,                                     //  retain
                    u2_atom b)                                     //  retain
   {
-    c3_w lna_w = u2_met(5, a);
-    c3_w lnb_w = u2_met(5, b);
+    c3_w lna_w = u2_cr_met(5, a);
+    c3_w lnb_w = u2_cr_met(5, b);
 
     if ( (lna_w == 0) && (lnb_w == 0) ) {
-      return _0;
+      return 0;
     } else {
-      c3_w   len_w = c3_max(lna_w, lnb_w);
-      u2_ray sal_r = u2_rl_slab(wir_r, len_w);
+      c3_w  len_w = c3_max(lna_w, lnb_w);
+      c3_w* sal_w = u2_ca_slab(len_w);
 
-      if ( 0 == sal_r ) {
-        return u2_bl_bail(wir_r, c3__fail);
+      if ( 0 == sal_w ) {
+        return u2_cm_bail(c3__fail);
       }
       else {
         c3_w i_w;
 
-        u2_chop(5, 0, lna_w, 0, sal_r, a);
+        u2_cr_chop(5, 0, lna_w, 0, sal_w, a);
 
         for ( i_w = 0; i_w < len_w; i_w++ ) {
-          *u2_at_ray(sal_r + i_w) &= (i_w >= lnb_w) ? 0 : u2_atom_word(b, i_w);
+          sal_w[i_w] &= (i_w >= lnb_w) ? 0 : u2_cr_word(i_w, b);
         }
-        return u2_rl_malt(wir_r, sal_r);
+        return u2_ca_malt(sal_w);
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, dis)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, dis)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) )
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, dis)(wir_r, a, b);
+      return j2_mbc(Pt3, dis)(a, b);
     }
   }
 
diff --git a/gen164/3/dor.c b/gen164/3/dor.c
index e8d9bd670..f6cd4de54 100644
--- a/gen164/3/dor.c
+++ b/gen164/3/dor.c
@@ -8,45 +8,45 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, dor)(u2_wire wir_r,
+  j2_mbc(Pt3, dor)(
                    u2_atom a,                                     //  retain
                    u2_atom b)                                     //  retain
   {
-    if ( u2_yes == u2_sing(a, b) ) {
+    if ( u2_yes == u2_cr_sing(a, b) ) {
       return u2_yes;
     }
     else {
-      if ( u2_yes == u2_stud(a) ) {
-        if ( u2_yes == u2_stud(b) ) {
-          return j2_mbc(Pt1, lth)(wir_r, a, b);
+      if ( u2_yes == u2ud(a) ) {
+        if ( u2_yes == u2ud(b) ) {
+          return j2_mbc(Pt1, lth)(a, b);
         }
         else {
           return u2_yes;
         }
       }
       else {
-        if ( u2_yes == u2_stud(b) ) {
+        if ( u2_yes == u2ud(b) ) {
           return u2_no;
         }
         else {
-          if ( u2_yes == u2_sing(u2_h(a), u2_h(b)) ) {
-            return j2_mbc(Pt3, dor)(wir_r, u2_t(a), u2_t(b));
+          if ( u2_yes == u2_cr_sing(u2h(a), u2h(b)) ) {
+            return j2_mbc(Pt3, dor)(u2t(a), u2t(b));
           }
-          else return j2_mbc(Pt3, dor)(wir_r, u2_h(a), u2_h(b));
+          else return j2_mbc(Pt3, dor)(u2h(a), u2h(b));
         }
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, dor)(u2_wire wir_r,
+  j2_mb(Pt3, dor)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) ) {
-      return u2_bl_bail(wir_r, c3__exit);
+    if ( u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0) ) {
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, dor)(wir_r, a, b);
+      return j2_mbc(Pt3, dor)(a, b);
     }
   }
 
diff --git a/gen164/3/end.c b/gen164/3/end.c
index f28fbaa6a..4d0cda225 100644
--- a/gen164/3/end.c
+++ b/gen164/3/end.c
@@ -8,56 +8,56 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, end)(u2_wire wir_r,
+  j2_mbc(Pt3, end)(
                    u2_atom a,                                     //  retain
                    u2_atom b,                                     //  retain
                    u2_atom c)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      return u2_cm_bail(c3__fail);
     }
-    else if ( !u2_fly_is_cat(b) ) {
-      return u2_rx(wir_r, c);
+    else if ( u2_ne(u2_co_is_cat(b)) ) {
+      return u2k(c);
     }
     else {
       c3_g a_g   = a;
       c3_w b_w   = b;
-      c3_w len_w = u2_met(a_g, c);
+      c3_w len_w = u2_cr_met(a_g, c);
 
-      if ( _0 == b_w ) {
-        return _0;
+      if ( 0 == b_w ) {
+        return 0;
       }
       else if ( b_w >= len_w ) {
-        return u2_rx(wir_r, c);
+        return u2k(c);
       }
       else {
-        u2_ray sal_r = u2_rl_slaq(wir_r, a_g, b_w);
+        c3_w* sal_w = u2_ca_slaq(a_g, b_w);
 
-        if ( 0 == sal_r ) {
-          return u2_bl_bail(wir_r, c3__fail);
+        if ( 0 == sal_w ) {
+          return u2_cm_bail(c3__fail);
         }
-        u2_chop(a_g, 0, b_w, 0, sal_r, c);
+        u2_cr_chop(a_g, 0, b_w, 0, sal_w, c);
 
-        return u2_rl_malt(wir_r, sal_r);
+        return u2_ca_malt(sal_w);
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, end)(u2_wire wir_r,
+  j2_mb(Pt3, end)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a,
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
                                 u2_cv_sam_6, &b,
                                 u2_cv_sam_7, &c, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) ||
-         (u2_no == u2_stud(c)) )
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) ||
+         (u2_no == u2ud(c)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, end)(wir_r, a, b, c);
+      return j2_mbc(Pt3, end)(a, b, c);
     }
   }
 
diff --git a/gen164/3/gor.c b/gen164/3/gor.c
index 73f6c388c..7de40b11c 100644
--- a/gen164/3/gor.c
+++ b/gen164/3/gor.c
@@ -8,28 +8,26 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, gor)(u2_wire wir_r,
-                   u2_noun a,                                     //  retain
+  j2_mbc(Pt3, gor)(u2_noun a,                                     //  retain
                    u2_noun b)                                     //  retain
   {
-    c3_w c_w = u2_mug(a);
-    c3_w d_w = u2_mug(b);
+    c3_w c_w = u2_cr_mug(a);
+    c3_w d_w = u2_cr_mug(b);
 
     if ( c_w == d_w ) {
-      return j2_mbc(Pt3, dor)(wir_r, a, b);
+      return j2_mbc(Pt3, dor)(a, b);
     }
     else return (c_w < d_w) ? u2_yes : u2_no;
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, gor)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, gor)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
-      return u2_bl_bail(wir_r, c3__exit);
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, gor)(wir_r, a, b);
+      return j2_mbc(Pt3, gor)(a, b);
     }
   }
 
diff --git a/gen164/3/hor.c b/gen164/3/hor.c
index c9296d9e7..4131af579 100644
--- a/gen164/3/hor.c
+++ b/gen164/3/hor.c
@@ -8,42 +8,40 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, hor)(u2_wire wir_r,
-                   u2_noun a,                                     //  retain
+  j2_mbc(Pt3, hor)(u2_noun a,                                     //  retain
                    u2_noun b)                                     //  retain
   {
-    if ( u2_yes == u2_stud(a) ) {
-      if ( u2_yes == u2_stud(b) ) {
-        return j2_mbc(Pt3, gor)(wir_r, a, b);
+    if ( u2_yes == u2ud(a) ) {
+      if ( u2_yes == u2ud(b) ) {
+        return j2_mbc(Pt3, gor)(a, b);
       } else {
         return u2_yes;
       }
     } else {
-      if ( u2_yes == u2_stud(b) ) {
+      if ( u2_yes == u2ud(b) ) {
         return u2_no;
       }
       else {
-        u2_noun h_a = u2_h(a);
-        u2_noun h_b = u2_h(b);
+        u2_noun h_a = u2h(a);
+        u2_noun h_b = u2h(b);
 
-        if ( u2_yes == u2_sing(h_a, h_b) ) {
-          return j2_mbc(Pt3, gor)(wir_r, u2_t(a), u2_t(b));
+        if ( u2_yes == u2_cr_sing(h_a, h_b) ) {
+          return j2_mbc(Pt3, gor)(u2t(a), u2t(b));
         } else {
-          return j2_mbc(Pt3, gor)(wir_r, h_a, h_b);
+          return j2_mbc(Pt3, gor)(h_a, h_b);
         }
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, hor)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, hor)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
-      return u2_bl_bail(wir_r, c3__exit);
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, hor)(wir_r, a, b);
+      return j2_mbc(Pt3, hor)(a, b);
     }
   }
 
diff --git a/gen164/3/lsh.c b/gen164/3/lsh.c
index c8d6dce8b..4018c350d 100644
--- a/gen164/3/lsh.c
+++ b/gen164/3/lsh.c
@@ -8,57 +8,57 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, lsh)(u2_wire wir_r,
+  j2_mbc(Pt3, lsh)(
                    u2_atom a,                                     //  retain
                    u2_atom b,                                     //  retain
                    u2_atom c)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      return u2_cm_bail(c3__fail);
     }
-    else if ( !u2_fly_is_cat(b) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    else if ( u2_ne(u2_co_is_cat(b)) ) {
+      return u2_cm_bail(c3__fail);
     }
     else {
       c3_g a_g   = a;
       c3_w b_w   = b;
-      c3_w len_w = u2_met(a_g, c);
+      c3_w len_w = u2_cr_met(a_g, c);
 
-      if ( _0 == len_w ) {
-        return _0;
+      if ( 0 == len_w ) {
+        return 0;
       }
       else if ( (b_w + len_w) < len_w ) {
-        return u2_bl_bail(wir_r, c3__exit);
+        return u2_cm_bail(c3__exit);
       }
       else {
-        u2_ray sal_r = u2_rl_slaq(wir_r, a_g, (b_w + len_w));
+        c3_w* sal_w = u2_ca_slaq(a_g, (b_w + len_w));
 
-        if ( 0 == sal_r ) {
-          return u2_bl_bail(wir_r, c3__fail);
+        if ( 0 == sal_w ) {
+          return u2_cm_bail(c3__fail);
         }
-        u2_chop(a_g, 0, len_w, b_w, sal_r, c);
+        u2_cr_chop(a_g, 0, len_w, b_w, sal_w, c);
 
-        // return u2_rl_moot(wir_r, sal_r);
-        return u2_rl_malt(wir_r, sal_r);
+        // return u2_ca_moot(sal_w);
+        return u2_ca_malt(sal_w);
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, lsh)(u2_wire wir_r,
+  j2_mb(Pt3, lsh)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a,
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
                                 u2_cv_sam_6, &b,
                                 u2_cv_sam_7, &c, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) ||
-         (u2_no == u2_stud(c)) )
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) ||
+         (u2_no == u2ud(c)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, lsh)(wir_r, a, b, c);
+      return j2_mbc(Pt3, lsh)(a, b, c);
     }
   }
 
diff --git a/gen164/3/mas.c b/gen164/3/mas.c
index 53ca2d574..596341145 100644
--- a/gen164/3/mas.c
+++ b/gen164/3/mas.c
@@ -8,41 +8,41 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, mas)(u2_wire wir_r,
+  j2_mbc(Pt3, mas)(
                    u2_atom a)                                     //  retain
   {
     c3_w b_w;
     u2_atom c, d, e, f;
 
-    b_w = u2_met(0, a);
+    b_w = u2_cr_met(0, a);
     if ( b_w < 2 ) {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     }
     else {
-      c = j2_mbc(Pt3, bex)(wir_r, (b_w - 1));
-      d = j2_mbc(Pt3, bex)(wir_r, (b_w - 2));
-      e = j2_mbc(Pt1, sub)(wir_r, a, c);
-      f = j2_mbc(Pt3, con)(wir_r, e, d);
+      c = j2_mbc(Pt3, bex)((b_w - 1));
+      d = j2_mbc(Pt3, bex)((b_w - 2));
+      e = j2_mbc(Pt1, sub)(a, c);
+      f = j2_mbc(Pt3, con)(e, d);
 
-      u2_rl_lose(wir_r, c);
-      u2_rl_lose(wir_r, d);
-      u2_rl_lose(wir_r, e);
+      u2z(c);
+      u2z(d);
+      u2z(e);
 
       return f;
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, mas)(u2_wire wir_r,
+  j2_mb(Pt3, mas)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a;
 
-    if ( (u2_none == (a = u2_frag(u2_cv_sam, cor))) ||
-         (u2_no == u2_stud(a)) )
+    if ( (u2_none == (a = u2_cr_at(u2_cv_sam, cor))) ||
+         (u2_no == u2ud(a)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, mas)(wir_r, a);
+      return j2_mbc(Pt3, mas)(a);
     }
   }
 
diff --git a/gen164/3/met.c b/gen164/3/met.c
index b5c2dc99d..b2ae05ac1 100644
--- a/gen164/3/met.c
+++ b/gen164/3/met.c
@@ -8,37 +8,37 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, met)(u2_wire wir_r,
+  j2_mbc(Pt3, met)(
                    u2_atom a,                                     //  retain
                    u2_atom b)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      if ( _0 == b ) {
-        return _0;
-      } else return _1;
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      if ( 0 == b ) {
+        return 0;
+      } else return 1;
     }
     else {
-      c3_w met_w = u2_met(a, b);
+      c3_w met_w = u2_cr_met(a, b);
 
-      if ( !u2_fly_is_cat(met_w) ) {
-        return u2_rl_words(wir_r, 1, &met_w);
+      if ( u2_ne(u2_co_is_cat(met_w)) ) {
+        return u2_ci_words(1, &met_w);
       }
-      else return u2_met(a, b);
+      else return u2_cr_met(a, b);
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, met)(u2_wire wir_r,
+  j2_mb(Pt3, met)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) )
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, met)(wir_r, a, b);
+      return j2_mbc(Pt3, met)(a, b);
     }
   }
 
diff --git a/gen164/3/mix.c b/gen164/3/mix.c
index 313cb2b08..d603b8389 100644
--- a/gen164/3/mix.c
+++ b/gen164/3/mix.c
@@ -8,47 +8,45 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, mix)(u2_wire wir_r,
-                   u2_atom a,                                     //  retain
+  j2_mbc(Pt3, mix)(u2_atom a,                                     //  retain
                    u2_atom b)                                     //  retain
   {
-    c3_w lna_w = u2_met(5, a);
-    c3_w lnb_w = u2_met(5, b);
+    c3_w lna_w = u2_cr_met(5, a);
+    c3_w lnb_w = u2_cr_met(5, b);
 
     if ( (lna_w == 0) && (lnb_w == 0) ) {
-      return _0;
+      return 0;
     } else {
-      c3_w   len_w = c3_max(lna_w, lnb_w);
-      u2_ray sal_r = u2_rl_slab(wir_r, len_w);
+      c3_w  len_w = c3_max(lna_w, lnb_w);
+      c3_w* sal_w = u2_ca_slab(len_w);
 
-      if ( 0 == sal_r ) {
-        return u2_bl_bail(wir_r, c3__fail);
+      if ( 0 == sal_w ) {
+        return u2_cm_bail(c3__fail);
       }
       else {
         c3_w i_w;
 
-        u2_chop(5, 0, lna_w, 0, sal_r, a);
+        u2_cr_chop(5, 0, lna_w, 0, sal_w, a);
 
         for ( i_w = 0; i_w < lnb_w; i_w++ ) {
-          *u2_at_ray(sal_r + i_w) ^= u2_atom_word(b, i_w);
+          sal_w[i_w] ^= u2_cr_word(i_w, b);
         }
-        return u2_rl_malt(wir_r, sal_r);
+        return u2_ca_malt(sal_w);
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, mix)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, mix)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) )
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, mix)(wir_r, a, b);
+      return j2_mbc(Pt3, mix)(a, b);
     }
   }
 
diff --git a/gen164/3/mug.c b/gen164/3/mug.c
index 36362f795..3b441935c 100644
--- a/gen164/3/mug.c
+++ b/gen164/3/mug.c
@@ -8,15 +8,15 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, mug)(u2_wire wir_r,
+  j2_mb(Pt3, mug)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun sam;
 
-    if ( u2_none == (sam = u2_frag(u2_cv_sam, cor)) ) {
-      return u2_bl_bail(wir_r, c3__exit);
+    if ( u2_none == (sam = u2_cr_at(u2_cv_sam, cor)) ) {
+      return u2_cm_bail(c3__exit);
     } else {
-      return u2_mug(sam);
+      return u2_cr_mug(sam);
     }
   }
 
diff --git a/gen164/3/peg.c b/gen164/3/peg.c
index 0251b5c19..9e211bd02 100644
--- a/gen164/3/peg.c
+++ b/gen164/3/peg.c
@@ -8,42 +8,42 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, peg)(u2_wire wir_r,
+  j2_mbc(Pt3, peg)(
                    u2_atom a,                                     //  retain
                    u2_atom b)                                     //  retain
   {
     u2_atom c, d, e, f, g, h;
 
-    c = u2_met(0, b);
-    d = j2_mbc(Pt1, dec)(wir_r, c);
-    e = j2_mbc(Pt3, lsh)(wir_r, _0, d, 1);
-    f = j2_mbc(Pt1, sub)(wir_r, b, e);
-    g = j2_mbc(Pt3, lsh)(wir_r, _0, d, a);
-    h = j2_mbc(Pt1, add)(wir_r, f, g);
+    c = u2_cr_met(0, b);
+    d = j2_mbc(Pt1, dec)(c);
+    e = j2_mbc(Pt3, lsh)(0, d, 1);
+    f = j2_mbc(Pt1, sub)(b, e);
+    g = j2_mbc(Pt3, lsh)(0, d, a);
+    h = j2_mbc(Pt1, add)(f, g);
 
-    u2_rl_lose(wir_r, c);
-    u2_rl_lose(wir_r, d);
-    u2_rl_lose(wir_r, e);
-    u2_rl_lose(wir_r, f);
-    u2_rl_lose(wir_r, g);
+    u2z(c);
+    u2z(d);
+    u2z(e);
+    u2z(f);
+    u2z(g);
 
     return h;
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, peg)(u2_wire wir_r,
+  j2_mb(Pt3, peg)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) ||
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) ||
          (0 == a) ||
          (0 == b) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, peg)(wir_r, a, b);
+      return j2_mbc(Pt3, peg)(a, b);
     }
   }
 
diff --git a/gen164/3/po.c b/gen164/3/po.c
index b53dcc456..44efe048f 100644
--- a/gen164/3/po.c
+++ b/gen164/3/po.c
@@ -10,7 +10,7 @@
   static u2_noun
   _po_find(u2_noun buf, u2_noun a)
   {
-    if ( !u2_fly_is_cat(a) ) {
+    if ( u2_ne(u2_co_is_cat(a)) ) {
       return u2_nul;
     }
     else {
@@ -33,51 +33,51 @@
   }
 
   u2_weak                                                         //  transfer
-  j2_mc(Pt3, po, ins)(u2_wire wir_r,
+  j2_mc(Pt3, po, ins)(
                       u2_noun cor)                                //  retain
   {
     u2_noun x, a, buf;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
          (u2_no == u2du(x)) ||
          (u2_no == u2ud(buf = u2h(x))) ||
          (u2_no == u2ud(a)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
       return _po_find(buf, a);
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt3, po, ind)(u2_wire wir_r,
+  j2_mc(Pt3, po, ind)(
                       u2_noun cor)                                //  retain
   {
     u2_noun x, a, buf;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
          (u2_no == u2du(x)) ||
          (u2_no == u2ud(buf = u2t(x))) ||
          (u2_no == u2ud(a)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
       return _po_find(buf, a);
     }
   }
 
   u2_weak                                                         //  transfer
-  j2_mc(Pt3, po, tos)(u2_wire wir_r,
+  j2_mc(Pt3, po, tos)(
                       u2_noun cor)                                //  retain
   {
     u2_noun x, a, buf;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
          (u2_no == u2du(x)) ||
          (u2_no == u2ud(buf = u2h(x))) ||
          (u2_no == u2ud(a)) ||
          (a >= 256) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     }
     else {
       c3_y byt_y[3];
@@ -87,18 +87,18 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt3, po, tod)(u2_wire wir_r,
+  j2_mc(Pt3, po, tod)(
                       u2_noun cor)                                //  retain
   {
     u2_noun x, a, buf;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam, &a, u2_cv_con_sam, &x, 0)) ||
          (u2_no == u2du(x)) ||
          (u2_no == u2ud(buf = u2t(x))) ||
          (u2_no == u2ud(a)) ||
          (a >= 256) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
       c3_y byt_y[3];
 
diff --git a/gen164/3/rap.c b/gen164/3/rap.c
index 79aeb191b..be1440e7b 100644
--- a/gen164/3/rap.c
+++ b/gen164/3/rap.c
@@ -8,17 +8,16 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, rap)(u2_wire wir_r,
-                   u2_atom a,                                     //  retain
+  j2_mbc(Pt3, rap)(u2_atom a,                                     //  retain
                    u2_noun b)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      return u2_bl_bail(wir_r, c3__exit);
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      return u2_cm_bail(c3__exit);
     }
     else {
-      c3_g   a_g = a;
-      c3_w   tot_w = 0;
-      u2_ray sal_r;
+      c3_g  a_g = a;
+      c3_w  tot_w = 0;
+      c3_w* sal_w;
 
       /* Measure and validate the slab required.
       */
@@ -29,26 +28,26 @@
           u2_noun h_cab;
           c3_w    len_w;
 
-          if ( _0 == cab ) {
+          if ( 0 == cab ) {
             break;
           }
-          else if ( u2_no == u2_dust(cab) ) {
-            return u2_bl_bail(wir_r, c3__exit);
+          else if ( u2_no == u2du(cab) ) {
+            return u2_cm_bail(c3__exit);
           }
-          else if ( u2_no == u2_stud(h_cab = u2_h(cab)) ) {
-            return u2_bl_bail(wir_r, c3__exit);
+          else if ( u2_no == u2ud(h_cab = u2h(cab)) ) {
+            return u2_cm_bail(c3__exit);
           }
-          else if ( (tot_w + (len_w = u2_met(a_g, h_cab))) < tot_w ) {
-            return u2_bl_bail(wir_r, c3__fail);
+          else if ( (tot_w + (len_w = u2_cr_met(a_g, h_cab))) < tot_w ) {
+            return u2_cm_bail(c3__fail);
           }
           tot_w += len_w;
-          cab = u2_t(cab);
+          cab = u2t(cab);
         }
         if ( 0 == tot_w ) {
-          return _0;
+          return 0;
         }
-        if ( 0 == (sal_r = u2_rl_slaq(wir_r, a_g, tot_w)) ) {
-          return u2_bl_bail(wir_r, c3__fail);
+        if ( 0 == (sal_w = u2_ca_slaq(a_g, tot_w)) ) {
+          return u2_cm_bail(c3__fail);
         }
       }
 
@@ -58,31 +57,30 @@
         u2_noun cab = b;
         c3_w    pos_w = 0;
 
-        while ( _0 != cab ) {
-          u2_noun h_cab = u2_h(cab);
-          c3_w    len_w = u2_met(a_g, h_cab);
+        while ( 0 != cab ) {
+          u2_noun h_cab = u2h(cab);
+          c3_w    len_w = u2_cr_met(a_g, h_cab);
 
-          u2_chop(a_g, 0, len_w, pos_w, sal_r, h_cab);
+          u2_cr_chop(a_g, 0, len_w, pos_w, sal_w, h_cab);
           pos_w += len_w;
-          cab = u2_t(cab);
+          cab = u2t(cab);
         }
       }
-      // return u2_rl_moot(wir_r, sal_r);
-      return u2_rl_malt(wir_r, sal_r);
+      // return u2_ca_moot(sal_w);
+      return u2_ca_malt(sal_w);
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, rap)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, rap)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
-         (u2_no == u2_stud(a)) )
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
+         (u2_no == u2ud(a)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, rap)(wir_r, a, b);
+      return j2_mbc(Pt3, rap)(a, b);
     }
   }
 
diff --git a/gen164/3/rip.c b/gen164/3/rip.c
index 5c84b1ab4..960dced57 100644
--- a/gen164/3/rip.c
+++ b/gen164/3/rip.c
@@ -8,12 +8,11 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, rip)(u2_wire wir_r,
-                   u2_atom a,                                     //  retain
+  j2_mbc(Pt3, rip)(u2_atom a,                                     //  retain
                    u2_atom b)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      return u2_cm_bail(c3__fail);
     }
     else {
       u2_noun pir = u2_nul;
@@ -21,7 +20,7 @@
       c3_w i_w;
 
       if ( a_g < 5 ) {
-        c3_w met_w = u2_met(a_g, b);
+        c3_w met_w = u2_cr_met(a_g, b);
         c3_w mek_w = ((1 << (1 << a_g)) - 1);
 
         for ( i_w = 0; i_w < met_w; i_w++ ) {
@@ -29,39 +28,39 @@
           c3_w bit_w = (pat_w << a_g);
           c3_w wor_w = (bit_w >> 5);
           c3_w sif_w = (bit_w & 31);
-          c3_w src_w = u2_atom_word(b, wor_w);
+          c3_w src_w = u2_cr_word(wor_w, b);
           c3_w rip_w = ((src_w >> sif_w) & mek_w);
 
-          pir = u2_rc(wir_r, rip_w, pir);
+          pir = u2nc(rip_w, pir);
         }
         return pir;
       }
       else {
-        c3_w met_w = u2_met(a_g, b);
-        c3_w len_w = u2_met(5, b);
+        c3_w met_w = u2_cr_met(a_g, b);
+        c3_w len_w = u2_cr_met(5, b);
         c3_g san_g = (a_g - 5);
         c3_w san_w = 1 << san_g;
         c3_w dif_w = (met_w << san_g) - len_w;
         c3_w tub_w = ((dif_w == 0) ? san_w : (san_w - dif_w));
 
         for ( i_w = 0; i_w < met_w; i_w++ ) {
-          c3_w    pat_w = (met_w - (i_w + 1));
-          c3_w    wut_w = (pat_w << san_g);
-          c3_w    sap_w = ((0 == i_w) ? tub_w : san_w);
-          u2_ray  sal_r = u2_rl_slab(wir_r, sap_w);
+          c3_w  pat_w = (met_w - (i_w + 1));
+          c3_w  wut_w = (pat_w << san_g);
+          c3_w  sap_w = ((0 == i_w) ? tub_w : san_w);
+          c3_w* sal_w = u2_ca_slab(sap_w);
 
-          if ( 0 == sal_r ) {
-            return u2_bl_bail(wir_r, c3__fail);
+          if ( 0 == sal_w ) {
+            return u2_cm_bail(c3__fail);
           } else {
             c3_w    j_w;
             u2_atom rip;
 
             for ( j_w = 0; j_w < sap_w; j_w++ ) {
-              *u2_at_ray(sal_r + j_w) = u2_atom_word(b, wut_w + j_w);
+              sal_w[j_w] = u2_cr_word(wut_w + j_w, b);
             }
 
-            rip = u2_rl_malt(wir_r, sal_r);
-            pir = u2_rc(wir_r, rip, pir);
+            rip = u2_ca_malt(sal_w);
+            pir = u2nc(rip, pir);
           }
           len_w -= san_w;
         }
@@ -70,18 +69,17 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, rip)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, rip)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) )
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ||
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, rip)(wir_r, a, b);
+      return j2_mbc(Pt3, rip)(a, b);
     }
   }
 
diff --git a/gen164/3/rsh.c b/gen164/3/rsh.c
index 903cbdb94..66918d1f2 100644
--- a/gen164/3/rsh.c
+++ b/gen164/3/rsh.c
@@ -8,54 +8,54 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, rsh)(u2_wire wir_r,
+  j2_mbc(Pt3, rsh)(
                    u2_atom a,                                     //  retain
                    u2_atom b,                                     //  retain
                    u2_atom c)                                     //  retain
   {
-    if ( !u2_fly_is_cat(a) || (a >= 32) ) {
-      return u2_bl_bail(wir_r, c3__fail);
+    if ( u2_ne(u2_co_is_cat(a)) || (a >= 32) ) {
+      return u2_cm_bail(c3__fail);
     }
-    else if ( !u2_fly_is_cat(b) ) {
-      return _0;
+    else if ( u2_ne(u2_co_is_cat(b)) ) {
+      return 0;
     }
     else {
       c3_g a_g   = a;
       c3_w b_w   = b;
-      c3_w len_w = u2_met(a_g, c);
+      c3_w len_w = u2_cr_met(a_g, c);
 
       if ( b_w >= len_w ) {
-        return _0;
+        return 0;
       }
       else {
-        u2_ray sal_r = u2_rl_slaq(wir_r, a_g, (len_w - b_w));
+        c3_w* sal_w = u2_ca_slaq(a_g, (len_w - b_w));
 
-        if ( 0 == sal_r ) {
-          return u2_bl_bail(wir_r, c3__fail);
+        if ( 0 == sal_w ) {
+          return u2_cm_bail(c3__fail);
         }
-        u2_chop(a_g, b_w, (len_w - b_w), 0, sal_r, c);
+        u2_cr_chop(a_g, b_w, (len_w - b_w), 0, sal_w, c);
 
-        // return u2_rl_moot(wir_r, sal_r);
-        return u2_rl_malt(wir_r, sal_r);
+        // return u2_ca_moot(sal_w);
+        return u2_ca_malt(sal_w);
       }
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, rsh)(u2_wire wir_r,
+  j2_mb(Pt3, rsh)(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a,
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a,
                                 u2_cv_sam_6, &b,
                                 u2_cv_sam_7, &c, 0)) ||
-         (u2_no == u2_stud(a)) ||
-         (u2_no == u2_stud(b)) ||
-         (u2_no == u2_stud(c)) )
+         (u2_no == u2ud(a)) ||
+         (u2_no == u2ud(b)) ||
+         (u2_no == u2ud(c)) )
     {
-      return u2_bl_bail(wir_r, c3__exit);
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, rsh)(wir_r, a, b, c);
+      return j2_mbc(Pt3, rsh)(a, b, c);
     }
   }
 
diff --git a/gen164/3/vor.c b/gen164/3/vor.c
index 599429017..b2196600c 100644
--- a/gen164/3/vor.c
+++ b/gen164/3/vor.c
@@ -8,28 +8,26 @@
 /* functions
 */
   u2_weak                                                         //  transfer
-  j2_mbc(Pt3, vor)(u2_wire wir_r,
-                   u2_atom a,                                     //  retain
+  j2_mbc(Pt3, vor)(u2_atom a,                                     //  retain
                    u2_atom b)                                     //  retain
   {
-    c3_w c_w = u2_mug(u2_mug(a));
-    c3_w d_w = u2_mug(u2_mug(b));
+    c3_w c_w = u2_cr_mug(u2_cr_mug(a));
+    c3_w d_w = u2_cr_mug(u2_cr_mug(b));
 
     if ( c_w == d_w ) {
-      return j2_mbc(Pt3, dor)(wir_r, a, b);
+      return j2_mbc(Pt3, dor)(a, b);
     }
     else return (c_w < d_w) ? u2_yes : u2_no;
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, vor)(u2_wire wir_r,
-                  u2_noun cor)                                    //  retain
+  j2_mb(Pt3, vor)(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
-    if ( (u2_no == u2_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
-      return u2_bl_bail(wir_r, c3__exit);
+    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &a, u2_cv_sam_3, &b, 0)) ) {
+      return u2_cm_bail(c3__exit);
     } else {
-      return j2_mbc(Pt3, vor)(wir_r, a, b);
+      return j2_mbc(Pt3, vor)(a, b);
     }
   }