From 6d52238ac12966cd89cd786750621a154352e472 Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Tue, 2 Sep 2014 22:46:55 -0700
Subject: [PATCH] Considerable refactorings.

---
 Makefile           |   9 +-
 gen164/1/add.c     |  10 +-
 gen164/1/dec.c     |  10 +-
 gen164/1/div.c     |  10 +-
 gen164/1/gte.c     |  10 +-
 gen164/1/gth.c     |  10 +-
 gen164/1/lte.c     |  10 +-
 gen164/1/lth.c     |  10 +-
 gen164/1/mod.c     |   7 --
 gen164/1/mul.c     |  10 +-
 gen164/1/sub.c     |   9 +-
 gen164/2/bind.c    |  10 +-
 gen164/2/clap.c    |  10 +-
 gen164/2/drop.c    |  10 +-
 gen164/2/flop.c    |  10 +-
 gen164/2/lent.c    |  10 +-
 gen164/2/levy.c    |  10 +-
 gen164/2/lien.c    |  10 +-
 gen164/2/need.c    |   9 +-
 gen164/2/reel.c    |  11 +-
 gen164/2/roll.c    |   9 +-
 gen164/2/scag.c    |  13 --
 gen164/2/skim.c    |  10 +-
 gen164/2/skip.c    |   9 +-
 gen164/2/slag.c    |   8 --
 gen164/2/snag.c    |   4 +-
 gen164/2/sort.c    |   9 +-
 gen164/2/turn.c    |   9 +-
 gen164/2/weld.c    |   9 +-
 gen164/3/bex.c     |   9 +-
 gen164/3/can.c     |   9 +-
 gen164/3/cap.c     |   9 +-
 gen164/3/cat.c     |  10 +-
 gen164/3/con.c     |   4 +-
 gen164/3/cut.c     |   9 +-
 gen164/3/dis.c     |   9 +-
 gen164/3/dor.c     |   9 +-
 gen164/3/end.c     |   9 +-
 gen164/3/gor.c     |   9 +-
 gen164/3/hor.c     |   9 +-
 gen164/3/lsh.c     |   9 +-
 gen164/3/mas.c     |   9 +-
 gen164/3/met.c     |   9 +-
 gen164/3/mix.c     |   9 +-
 gen164/3/mug.c     |   7 --
 gen164/3/peg.c     |   9 +-
 gen164/3/po.c      |  42 -------
 gen164/3/rap.c     |   9 +-
 gen164/3/rip.c     |  10 +-
 gen164/3/rsh.c     |   9 +-
 gen164/3/vor.c     |  10 +-
 gen164/4/by.c      |  32 -----
 gen164/4/by_gas.c  |  10 +-
 gen164/4/by_get.c  |  10 +-
 gen164/4/by_has.c  |   9 +-
 gen164/4/by_int.c  |  13 +-
 gen164/4/by_put.c  |  10 +-
 gen164/4/by_uni.c  |  11 +-
 gen164/4/in.c      |  39 ------
 gen164/4/in_gas.c  |  10 +-
 gen164/4/in_has.c  |  10 +-
 gen164/4/in_int.c  |  12 +-
 gen164/4/in_mer.c  |   9 --
 gen164/4/in_put.c  |   9 +-
 gen164/4/in_tap.c  |  10 +-
 gen164/4/in_uni.c  |  10 +-
 gen164/5/aesc.c    |  29 -----
 gen164/5/cue.c     |  10 +-
 gen164/5/ed.c      |  28 -----
 gen164/5/ed_puck.c |   7 --
 gen164/5/ed_sign.c |   7 --
 gen164/5/ed_veri.c |   8 --
 gen164/5/jam.c     |  10 +-
 gen164/5/lore.c    |   9 --
 gen164/5/loss.c    |   9 --
 gen164/5/mat.c     |  10 +-
 gen164/5/mink.c    |   8 --
 gen164/5/mule.c    |   8 --
 gen164/5/parse.c   | 292 +++++++--------------------------------------
 gen164/5/rd.c      |  77 ------------
 gen164/5/repg.c    |   9 --
 gen164/5/rexp.c    |   9 --
 gen164/5/rub.c     |  10 +-
 gen164/5/shax.c    |  37 ------
 gen164/5/tape.c    |   8 --
 gen164/5/trip.c    |   8 --
 gen164/6/ap.c      |  26 ++--
 gen164/6/bull.c    |  10 +-
 gen164/6/cell.c    |  10 +-
 gen164/6/comb.c    |  10 +-
 gen164/6/cons.c    |  10 +-
 gen164/6/core.c    |  10 +-
 gen164/6/cube.c    |  10 +-
 gen164/6/face.c    |  10 +-
 gen164/6/fine.c    |  10 +-
 gen164/6/fitz.c    |  10 +-
 gen164/6/flan.c    |  10 +-
 gen164/6/flay.c    |  10 +-
 gen164/6/flip.c    |  10 +-
 gen164/6/flor.c    |  10 +-
 gen164/6/fork.c    |  10 +-
 gen164/6/hike.c    |  10 +-
 gen164/6/look.c    |  10 +-
 gen164/6/slot.c    |   8 --
 gen164/6/spec.c    |  79 ------------
 gen164/6/ut.c      | 118 ------------------
 gen164/6/ut_burn.c |  26 ++--
 gen164/6/ut_busk.c |  24 +---
 gen164/6/ut_bust.c |  26 +---
 gen164/6/ut_conk.c |  27 ++---
 gen164/6/ut_crop.c |  24 +---
 gen164/6/ut_cull.c |  38 ++----
 gen164/6/ut_find.c |  40 +------
 gen164/6/ut_fink.c |  24 +---
 gen164/6/ut_fire.c |  25 ++--
 gen164/6/ut_firm.c |  42 ++-----
 gen164/6/ut_fish.c |  24 +---
 gen164/6/ut_fuse.c |  24 +---
 gen164/6/ut_heal.c |  24 +---
 gen164/6/ut_mint.c |  34 ++----
 gen164/6/ut_moot.c | 145 ----------------------
 gen164/6/ut_mull.c |  26 +---
 gen164/6/ut_nest.c |  46 ++-----
 gen164/6/ut_park.c |  20 +---
 gen164/6/ut_peek.c |  32 ++---
 gen164/6/ut_play.c |  21 +---
 gen164/6/ut_repo.c |   2 +-
 gen164/6/ut_rest.c |  28 +----
 gen164/6/ut_seek.c |  27 +----
 gen164/6/ut_sift.c |  19 +--
 gen164/6/ut_swab.c |  20 +---
 gen164/6/ut_tock.c |  19 +--
 gen164/6/ut_wrap.c |  25 ++--
 include/f/meme.h   |   5 +-
 include/f/qjet.h   |  12 +-
 135 files changed, 294 insertions(+), 2245 deletions(-)
 delete mode 100644 gen164/4/by.c
 delete mode 100644 gen164/4/in.c
 delete mode 100644 gen164/5/ed.c
 delete mode 100644 gen164/6/spec.c
 delete mode 100644 gen164/6/ut_moot.c

diff --git a/Makefile b/Makefile
index 486b6c5d4a..cbce4afae9 100644
--- a/Makefile
+++ b/Makefile
@@ -150,8 +150,6 @@ J164_3_OFILES=\
        gen164/3/vor.o
 
 J164_4_OFILES=\
-       gen164/4/in.o \
-       gen164/4/by.o \
        gen164/4/in_has.o \
        gen164/4/in_int.o \
        gen164/4/in_gas.o \
@@ -169,7 +167,6 @@ J164_4_OFILES=\
 J164_5_OFILES=\
        gen164/5/aesc.o \
        gen164/5/cue.o \
-       gen164/5/ed.o \
        gen164/5/jam.o \
        gen164/5/mat.o \
        gen164/5/mink.o \
@@ -213,9 +210,9 @@ J164_6_OFILES=\
        gen164/6/fork.o \
        gen164/6/hike.o \
        gen164/6/look.o \
-       gen164/6/ut.o
 
 J164_6_OFILES_UT=\
+       gen164/6/ut.o \
        gen164/6/ut_burn.o \
        gen164/6/ut_busk.o \
        gen164/6/ut_bust.o \
@@ -232,7 +229,6 @@ J164_6_OFILES_UT=\
        gen164/6/ut_heal.o \
        gen164/6/ut_lose.o \
        gen164/6/ut_mint.o \
-       gen164/6/ut_moot.o \
        gen164/6/ut_mull.o \
        gen164/6/ut_nest.o \
        gen164/6/ut_park.o \
@@ -255,8 +251,7 @@ J164_OFILES=\
        $(J164_5_OFILES_CO) \
        $(J164_5_OFILES_ED) \
        $(J164_6_OFILES) \
-       $(J164_6_OFILES_UT) \
-       gen164/watt.o
+       $(J164_6_OFILES_UT)
 
 BASE_OFILES=\
        $(F_OFILES) \
diff --git a/gen164/1/add.c b/gen164/1/add.c
index 595c45d205..b98abf7477 100644
--- a/gen164/1/add.c
+++ b/gen164/1/add.c
@@ -29,7 +29,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, add)(u2_noun cor)                                    //  retain
+  u2_cwa_add(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -42,11 +42,3 @@
       return u2_cqa_add(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, add)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, add), u2_jet_live, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/1/dec.c b/gen164/1/dec.c
index 361c0496fd..d848f436d9 100644
--- a/gen164/1/dec.c
+++ b/gen164/1/dec.c
@@ -34,7 +34,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, dec)(u2_noun cor)                                    //  retain
+  u2_cwa_dec(u2_noun cor)                                    //  retain
   {
     u2_noun a;
 
@@ -46,11 +46,3 @@
       return u2_cqa_dec(a);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, dec)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, dec), u2_jet_live, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/1/div.c b/gen164/1/div.c
index 784c612bfa..18eb6fa2f9 100644
--- a/gen164/1/div.c
+++ b/gen164/1/div.c
@@ -32,7 +32,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, div)(u2_noun cor)                                    //  retain
+  u2_cwa_div(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -45,11 +45,3 @@
       return u2_cqa_div(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, div)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, div), u2_jet_live, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/1/gte.c b/gen164/1/gte.c
index 45fc428fbf..8fba314b49 100644
--- a/gen164/1/gte.c
+++ b/gen164/1/gte.c
@@ -31,7 +31,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, gte)(
+  u2_cwa_gte(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
@@ -45,11 +45,3 @@
       return u2_cqa_gte(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, gte)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, gte), Tier1, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/1/gth.c b/gen164/1/gth.c
index f02e03717e..e6b86e40b6 100644
--- a/gen164/1/gth.c
+++ b/gen164/1/gth.c
@@ -30,7 +30,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, gth)(u2_noun cor)                                    //  retain
+  u2_cwa_gth(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -43,11 +43,3 @@
       return u2_cqa_gth(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, gth)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, gth), Tier1, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/1/lte.c b/gen164/1/lte.c
index f84b95d244..4133a093f3 100644
--- a/gen164/1/lte.c
+++ b/gen164/1/lte.c
@@ -30,7 +30,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, lte)(u2_noun cor)                                    //  retain
+  u2_cwa_lte(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -43,11 +43,3 @@
       return u2_cqa_lte(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, lte)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, lte), Tier1, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/1/lth.c b/gen164/1/lth.c
index 964cd02518..03523ce938 100644
--- a/gen164/1/lth.c
+++ b/gen164/1/lth.c
@@ -30,7 +30,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, lth)(u2_noun cor)                                    //  retain
+  u2_cwa_lth(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -43,11 +43,3 @@
       return u2_cqa_lth(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, lth)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, lth), Tier1, u2_none, u2_none },
-   { }
-  };
diff --git a/gen164/1/mod.c b/gen164/1/mod.c
index a03beb39aa..b8c41d1888 100644
--- a/gen164/1/mod.c
+++ b/gen164/1/mod.c
@@ -42,10 +42,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, mod)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, mod), Tier1, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/1/mul.c b/gen164/1/mul.c
index 1a28ec19f6..4895252604 100644
--- a/gen164/1/mul.c
+++ b/gen164/1/mul.c
@@ -29,7 +29,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, mul)(u2_noun cor)                                    //  retain
+  u2_cwa_mul(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -43,11 +43,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, mul)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, mul), u2_jet_live, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/1/sub.c b/gen164/1/sub.c
index 434285c476..ae1f316bbd 100644
--- a/gen164/1/sub.c
+++ b/gen164/1/sub.c
@@ -36,7 +36,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt1, sub)(
+  u2_cwa_sub(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
@@ -51,10 +51,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt1, sub)[] = {
-    { ".2", c3__lite, j2_mb(Pt1, sub), u2_jet_live, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/bind.c b/gen164/2/bind.c
index 31704e1c5f..6658d7be4a 100644
--- a/gen164/2/bind.c
+++ b/gen164/2/bind.c
@@ -19,7 +19,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, bind)(
+  u2_cwb_bind(
                    u2_noun cor)                                   // retain
   {
     u2_noun a, b;
@@ -31,11 +31,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, bind)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, bind), Tier2, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/2/clap.c b/gen164/2/clap.c
index 6277faeb89..e9ae95a434 100644
--- a/gen164/2/clap.c
+++ b/gen164/2/clap.c
@@ -23,7 +23,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt2, clap)(u2_noun cor)                                   //  retain
+  u2_cwb_clap(u2_noun cor)                                   //  retain
   {
     u2_noun a, b, c;
 
@@ -35,11 +35,3 @@
       return u2_cqb_clap(a, b, c);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, clap)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, clap), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/drop.c b/gen164/2/drop.c
index f5badcc934..2b3ac5b722 100644
--- a/gen164/2/drop.c
+++ b/gen164/2/drop.c
@@ -18,7 +18,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt2, drop)(u2_noun cor)                                   //  retain
+  u2_cwb_drop(u2_noun cor)                                   //  retain
   {
     u2_noun a;
 
@@ -29,11 +29,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, drop)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, drop), Tier2, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/2/flop.c b/gen164/2/flop.c
index 2c889fe0d6..ee64bd7426 100644
--- a/gen164/2/flop.c
+++ b/gen164/2/flop.c
@@ -29,7 +29,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt2, flop)(
+  u2_cwb_flop(
                    u2_noun cor)                                   //  retain
   {
     u2_noun a;
@@ -40,11 +40,3 @@
       return u2_cqb_flop(a);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, flop)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, flop), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/lent.c b/gen164/2/lent.c
index 4dd0cc9406..208b8a31d5 100644
--- a/gen164/2/lent.c
+++ b/gen164/2/lent.c
@@ -28,7 +28,7 @@
     }
   }
   u2_noun
-  j2_mb(Pt2, lent)(
+  u2_cwb_lent(
                    u2_noun cor)                                   //  retain
   {
     u2_noun a;
@@ -39,11 +39,3 @@
       return u2_cqb_lent(a);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, lent)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, lent), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/levy.c b/gen164/2/levy.c
index adaa086fb9..32f9d71f88 100644
--- a/gen164/2/levy.c
+++ b/gen164/2/levy.c
@@ -29,7 +29,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, levy)(
+  u2_cwb_levy(
                    u2_noun cor)                                   // retain
   {
     u2_noun a, b;
@@ -40,11 +40,3 @@
       return u2_cqb_levy(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, levy)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, levy), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/lien.c b/gen164/2/lien.c
index 6b60497b7a..41bc475cb3 100644
--- a/gen164/2/lien.c
+++ b/gen164/2/lien.c
@@ -28,7 +28,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, lien)(u2_noun cor)                                   // retain
+  u2_cwb_lien(u2_noun cor)                                   // retain
   {
     u2_noun a, b;
 
@@ -38,11 +38,3 @@
       return u2_cqb_lien(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, lien)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, lien), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/need.c b/gen164/2/need.c
index fea6a2ec44..f609c5bce1 100644
--- a/gen164/2/need.c
+++ b/gen164/2/need.c
@@ -19,7 +19,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt2, need)(
+  u2_cwb_need(
                    u2_noun cor)                                   //  retain
   {
     u2_noun a;
@@ -31,10 +31,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, need)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, need), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/reel.c b/gen164/2/reel.c
index 7b9e0fc3d9..5910435eda 100644
--- a/gen164/2/reel.c
+++ b/gen164/2/reel.c
@@ -26,7 +26,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, reel)(
+  u2_cwb_reel(
                    u2_noun cor)                                   // retain
   {
     u2_noun a, b;
@@ -37,12 +37,3 @@
       return u2_cqb_reel(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, reel)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, reel), Tier2, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/2/roll.c b/gen164/2/roll.c
index 24574f4ed7..0f3b24c34c 100644
--- a/gen164/2/roll.c
+++ b/gen164/2/roll.c
@@ -34,7 +34,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, roll)(u2_noun cor)                                   // retain
+  u2_cwb_roll(u2_noun cor)                                   // retain
   {
     u2_noun a, b;
 
@@ -45,10 +45,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, roll)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, roll), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/scag.c b/gen164/2/scag.c
index 9b3d472c53..08c45a2084 100644
--- a/gen164/2/scag.c
+++ b/gen164/2/scag.c
@@ -49,16 +49,3 @@
     }
   }
 
-/* structures
-*/
-  /* u2_ho_jet */
-  /* j2_mbj(Pt2, scag)[] = { */
-  /*   { ".2", c3__lite, j2_mb(Pt2, scag), u2_jet_dead, u2_none, u2_none }, */
-  /*   { } */
-  /* }; */
-
-  u2_ho_jet
-  j2_mbj(Pt2, scag)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, scag), u2_jet_dead, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/skim.c b/gen164/2/skim.c
index c561204827..ebaf0d9e7f 100644
--- a/gen164/2/skim.c
+++ b/gen164/2/skim.c
@@ -31,7 +31,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, skim)(
+  u2_cwb_skim(
                    u2_noun cor)                                   // retain
   {
     u2_noun a, b;
@@ -43,11 +43,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, skim)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, skim), Tier2, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/2/skip.c b/gen164/2/skip.c
index 70f4bb1c40..deec8ec3e9 100644
--- a/gen164/2/skip.c
+++ b/gen164/2/skip.c
@@ -31,7 +31,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, skip)(
+  u2_cwb_skip(
                    u2_noun cor)                                   // retain
   {
     u2_noun a, b;
@@ -43,10 +43,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, skip)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, skip), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/slag.c b/gen164/2/slag.c
index 19b501bf76..e53be348b1 100644
--- a/gen164/2/slag.c
+++ b/gen164/2/slag.c
@@ -40,11 +40,3 @@
       return j2_mbc(Pt2, slag)(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, slag)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, slag), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/snag.c b/gen164/2/snag.c
index ac95c3c7fa..eb15d804b8 100644
--- a/gen164/2/snag.c
+++ b/gen164/2/snag.c
@@ -31,7 +31,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, snag)(u2_noun cor)                                   // retain
+  u2_cwb_snag(u2_noun cor)                                   // retain
   {
     u2_noun a, b;
 
@@ -48,6 +48,6 @@
 */
   u2_ho_jet
   j2_mbj(Pt2, snag)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, snag), Tier2, u2_none, u2_none },
+    { ".2", c3__lite, u2_cwb_snag, Tier2, u2_none, u2_none },
     { }
   };
diff --git a/gen164/2/sort.c b/gen164/2/sort.c
index 774d3d3a7a..1523c5eeac 100644
--- a/gen164/2/sort.c
+++ b/gen164/2/sort.c
@@ -17,7 +17,7 @@
     return u2_cm_bail(c3__fail);
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, sort)(
+  u2_cwb_sort(
                    u2_noun cor)                                   // retain
   {
     u2_noun a, b;
@@ -29,10 +29,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, sort)[] = {
-    { ".2", c3__lite, u2_jet_dead, Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/turn.c b/gen164/2/turn.c
index c642c874e0..630a04cd5d 100644
--- a/gen164/2/turn.c
+++ b/gen164/2/turn.c
@@ -25,7 +25,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, turn)(
+  u2_cwb_turn(
                    u2_noun cor)                                   // retain
   {
     u2_noun a, b;
@@ -37,10 +37,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, turn)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, turn), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/2/weld.c b/gen164/2/weld.c
index ae104a4790..e3f8f11ec8 100644
--- a/gen164/2/weld.c
+++ b/gen164/2/weld.c
@@ -22,7 +22,7 @@
     }
   }
   u2_noun                                                         // transfer
-  j2_mb(Pt2, weld)(u2_noun cor)                                   // retain
+  u2_cwb_weld(u2_noun cor)                                   // retain
   {
     u2_noun a, b;
 
@@ -33,10 +33,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt2, weld)[] = {
-    { ".2", c3__lite, j2_mb(Pt2, weld), Tier2, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/bex.c b/gen164/3/bex.c
index 10613dabfc..91077969aa 100644
--- a/gen164/3/bex.c
+++ b/gen164/3/bex.c
@@ -23,7 +23,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, bex)(
+  u2_cwc_bex(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a;
@@ -37,10 +37,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, bex)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, bex), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/can.c b/gen164/3/can.c
index 4def9bb426..bcb2dc145c 100644
--- a/gen164/3/can.c
+++ b/gen164/3/can.c
@@ -70,7 +70,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, can)(u2_noun cor)                                    //  retain
+  u2_cwc_can(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -83,10 +83,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, can)[] = {
-    { ".2", c3__hevy, j2_mb(Pt3, can), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/cap.c b/gen164/3/cap.c
index ab9c8e2ce2..e380bf433b 100644
--- a/gen164/3/cap.c
+++ b/gen164/3/cap.c
@@ -23,7 +23,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, cap)(
+  u2_cwc_cap(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a;
@@ -37,10 +37,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, cap)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, cap), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/cat.c b/gen164/3/cat.c
index 25983b5b8f..d5b03edf8b 100644
--- a/gen164/3/cat.c
+++ b/gen164/3/cat.c
@@ -40,7 +40,7 @@
   }
 
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, cat)(u2_noun cor)                                    //  retain
+  u2_cwc_cat(u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c;
 
@@ -57,11 +57,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, cat)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, cat), Tier3, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/3/con.c b/gen164/3/con.c
index f302ac325b..4d4caac0ca 100644
--- a/gen164/3/con.c
+++ b/gen164/3/con.c
@@ -37,7 +37,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, con)(u2_noun cor)                                    //  retain
+  u2_cwc_con(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -55,6 +55,6 @@
 */
   u2_ho_jet
   j2_mbj(Pt3, con)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, con), Tier3, u2_none, u2_none },
+    { ".2", c3__lite, u2_cwc_con, Tier3, u2_none, u2_none },
     { }
   };
diff --git a/gen164/3/cut.c b/gen164/3/cut.c
index 83ba85c91e..95b41579ef 100644
--- a/gen164/3/cut.c
+++ b/gen164/3/cut.c
@@ -52,7 +52,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, cut)(
+  u2_cwc_cut(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c, d;
@@ -72,10 +72,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, cut)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, cut), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/dis.c b/gen164/3/dis.c
index 350c22ec93..e42c406e5e 100644
--- a/gen164/3/dis.c
+++ b/gen164/3/dis.c
@@ -36,7 +36,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, dis)(u2_noun cor)                                    //  retain
+  u2_cwc_dis(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -50,10 +50,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, dis)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, dis), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/dor.c b/gen164/3/dor.c
index b00c8cb6bb..4114547b86 100644
--- a/gen164/3/dor.c
+++ b/gen164/3/dor.c
@@ -38,7 +38,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, dor)(
+  u2_cwc_dor(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
@@ -50,10 +50,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, dor)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, dor), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/end.c b/gen164/3/end.c
index e2d01e1051..70e0043057 100644
--- a/gen164/3/end.c
+++ b/gen164/3/end.c
@@ -43,7 +43,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, end)(
+  u2_cwc_end(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c;
@@ -61,10 +61,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, end)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, end), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/gor.c b/gen164/3/gor.c
index cf6d176b86..de98e6cd56 100644
--- a/gen164/3/gor.c
+++ b/gen164/3/gor.c
@@ -20,7 +20,7 @@
     else return (c_w < d_w) ? u2_yes : u2_no;
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, gor)(u2_noun cor)                                    //  retain
+  u2_cwc_gor(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -31,10 +31,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, gor)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, gor), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/hor.c b/gen164/3/hor.c
index ea53b1438e..743ffc0e42 100644
--- a/gen164/3/hor.c
+++ b/gen164/3/hor.c
@@ -34,7 +34,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, hor)(u2_noun cor)                                    //  retain
+  u2_cwc_hor(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -45,10 +45,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, hor)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, hor), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/lsh.c b/gen164/3/lsh.c
index 54bddbc3a6..a71b805097 100644
--- a/gen164/3/lsh.c
+++ b/gen164/3/lsh.c
@@ -44,7 +44,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, lsh)(
+  u2_cwc_lsh(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c;
@@ -62,10 +62,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, lsh)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, lsh), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/mas.c b/gen164/3/mas.c
index 1e8a71d6ee..51ca28f3a1 100644
--- a/gen164/3/mas.c
+++ b/gen164/3/mas.c
@@ -32,7 +32,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, mas)(
+  u2_cwc_mas(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a;
@@ -46,10 +46,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, mas)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, mas), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/met.c b/gen164/3/met.c
index ee648da42d..2f0af0cd01 100644
--- a/gen164/3/met.c
+++ b/gen164/3/met.c
@@ -27,7 +27,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, met)(
+  u2_cwc_met(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
@@ -42,10 +42,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, met)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, met), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/mix.c b/gen164/3/mix.c
index f7859b99fe..efb2bc7069 100644
--- a/gen164/3/mix.c
+++ b/gen164/3/mix.c
@@ -36,7 +36,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, mix)(u2_noun cor)                                    //  retain
+  u2_cwc_mix(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -50,10 +50,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, mix)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, mix), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/mug.c b/gen164/3/mug.c
index 3b441935ce..4ae246d506 100644
--- a/gen164/3/mug.c
+++ b/gen164/3/mug.c
@@ -20,10 +20,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, mug)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, mug), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/peg.c b/gen164/3/peg.c
index 041fa2b8a4..9661ce0e91 100644
--- a/gen164/3/peg.c
+++ b/gen164/3/peg.c
@@ -30,7 +30,7 @@
     return h;
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, peg)(
+  u2_cwc_peg(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
@@ -47,10 +47,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, peg)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, peg), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/po.c b/gen164/3/po.c
index 44efe048fe..9877b47390 100644
--- a/gen164/3/po.c
+++ b/gen164/3/po.c
@@ -106,45 +106,3 @@
       return (byt_y[0] | (byt_y[1] << 8) | (byt_y[2] << 16));
     }
   }
-
-/* declarations
-*/
-// # define crap u2_jet_dead
-# define crap u2_jet_test | u2_jet_live
-
-  u2_ho_jet
-  j2_mcj(Pt3, po, ind)[] = {
-    { ".2", c3__lite, j2_mc(Pt3, po, ind), Tier3, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt3, po, ins)[] = {
-    { ".2", c3__lite, j2_mc(Pt3, po, ins), Tier3, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt3, po, tod)[] = {
-    { ".2", c3__lite, j2_mc(Pt3, po, tod), Tier3, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt3, po, tos)[] = {
-    { ".2", c3__lite, j2_mc(Pt3, po, tos), Tier3, u2_none, u2_none },
-    { }
-  };
-
-
-/* structures
-*/
-  u2_ho_driver
-  j2_mbd(Pt3, po)[] = {
-    { j2_sc(Pt3, po, ind), j2_mcj(Pt3, po, ind), 0, 0, u2_none },
-    { j2_sc(Pt3, po, ins), j2_mcj(Pt3, po, ins), 0, 0, u2_none },
-    { j2_sc(Pt3, po, tod), j2_mcj(Pt3, po, tod), 0, 0, u2_none },
-    { j2_sc(Pt3, po, tos), j2_mcj(Pt3, po, tos), 0, 0, u2_none },
-    {}
-  };
-
-  u2_ho_driver
-  j2_db(Pt3, po) =
-    { j2_sb(Pt3, po), 0, j2_mbd(Pt3, po), 0, u2_none };
diff --git a/gen164/3/rap.c b/gen164/3/rap.c
index 61450efe65..97b62e38a7 100644
--- a/gen164/3/rap.c
+++ b/gen164/3/rap.c
@@ -71,7 +71,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, rap)(u2_noun cor)                                    //  retain
+  u2_cwc_rap(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -84,10 +84,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, rap)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, rap), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/rip.c b/gen164/3/rip.c
index 0eb765aba9..d89bcd15b9 100644
--- a/gen164/3/rip.c
+++ b/gen164/3/rip.c
@@ -69,7 +69,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, rip)(u2_noun cor)                                    //  retain
+  u2_cwc_rip(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -82,11 +82,3 @@
       return u2_cqc_rip(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, rip)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, rip), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/rsh.c b/gen164/3/rsh.c
index 4eae8e0621..c52dd09e37 100644
--- a/gen164/3/rsh.c
+++ b/gen164/3/rsh.c
@@ -41,7 +41,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, rsh)(
+  u2_cwc_rsh(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b, c;
@@ -59,10 +59,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, rsh)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, rsh), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/3/vor.c b/gen164/3/vor.c
index ed11ea14a2..80ee8b9fbf 100644
--- a/gen164/3/vor.c
+++ b/gen164/3/vor.c
@@ -20,7 +20,7 @@
     else return (c_w < d_w) ? u2_yes : u2_no;
   }
   u2_weak                                                         //  transfer
-  j2_mb(Pt3, vor)(u2_noun cor)                                    //  retain
+  u2_cwc_vor(u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
 
@@ -30,11 +30,3 @@
       return u2_cqc_vor(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt3, vor)[] = {
-    { ".2", c3__lite, j2_mb(Pt3, vor), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/by.c b/gen164/4/by.c
deleted file mode 100644
index 878b075378..0000000000
--- a/gen164/4/by.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/* j/4/by.c
-**
-** This file is in the public domain.
-*/
-#include "all.h"
-#include "../pit.h"
-
-/* declarations
-*/
-  extern u2_ho_jet j2_mcj(Pt4, by, gas)[];
-  extern u2_ho_jet j2_mcj(Pt4, by, get)[];
-  extern u2_ho_jet j2_mcj(Pt4, by, has)[];
-  extern u2_ho_jet j2_mcj(Pt4, by, int)[];
-  extern u2_ho_jet j2_mcj(Pt4, by, put)[];
-  extern u2_ho_jet j2_mcj(Pt4, by, uni)[];
-
-/* structures
-*/
-  u2_ho_driver
-  j2_mbd(Pt4, by)[] = {
-    { j2_sc(Pt4, by, gas), j2_mcj(Pt4, by, gas), 0, 0, u2_none },
-    { j2_sc(Pt4, by, get), j2_mcj(Pt4, by, get), 0, 0, u2_none },
-    { j2_sc(Pt4, by, has), j2_mcj(Pt4, by, has), 0, 0, u2_none },
-    { j2_sc(Pt4, by, int), j2_mcj(Pt4, by, int), 0, 0, u2_none },
-    { j2_sc(Pt4, by, put), j2_mcj(Pt4, by, put), 0, 0, u2_none },
-    { j2_sc(Pt4, by, uni), j2_mcj(Pt4, by, uni), 0, 0, u2_none },
-    {}
-  };
-
-  u2_ho_driver
-  j2_db(Pt4, by) =
-    { j2_sb(Pt4, by), 0, j2_mbd(Pt4, by), 0, u2_none };
diff --git a/gen164/4/by_gas.c b/gen164/4/by_gas.c
index ffcb5b0a43..0c457207b6 100644
--- a/gen164/4/by_gas.c
+++ b/gen164/4/by_gas.c
@@ -42,7 +42,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, by, gas)(
+  u2_cwdb_gas(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -53,11 +53,3 @@
       return u2_cqdb_gas(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, by, gas)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, by, gas), Tier4, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/by_get.c b/gen164/4/by_get.c
index 88436e693c..a69c1c47fc 100644
--- a/gen164/4/by_get.c
+++ b/gen164/4/by_get.c
@@ -38,7 +38,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, by, get)(
+  u2_cwdb_get(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -49,11 +49,3 @@
       return u2_cqdb_get(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, by, get)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, by, get), Tier4, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/by_has.c b/gen164/4/by_has.c
index b4669aaf01..fff8f58378 100644
--- a/gen164/4/by_has.c
+++ b/gen164/4/by_has.c
@@ -38,7 +38,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, by, has)(
+  u2_cwdb_has(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -50,10 +50,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, by, has)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, by, has), Tier4, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/by_int.c b/gen164/4/by_int.c
index 8737389ac8..59f00772bc 100644
--- a/gen164/4/by_int.c
+++ b/gen164/4/by_int.c
@@ -111,7 +111,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, by, int)(
+  u2_cwdb_int(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -122,14 +122,3 @@
       return u2_cqdb_int(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, by, int)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, by, int), Tier4, u2_none, u2_none },
-    { }
-  };
-
-
-
diff --git a/gen164/4/by_put.c b/gen164/4/by_put.c
index e36c22d932..ed51d1255a 100644
--- a/gen164/4/by_put.c
+++ b/gen164/4/by_put.c
@@ -92,7 +92,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, by, put)(
+  u2_cwdb_put(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b, c;
@@ -105,11 +105,3 @@
       return u2_cqdb_put(a, b, c);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, by, put)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, by, put), Tier4, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/by_uni.c b/gen164/4/by_uni.c
index 9da3861d54..142a17b80f 100644
--- a/gen164/4/by_uni.c
+++ b/gen164/4/by_uni.c
@@ -115,7 +115,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, by, uni)(
+  u2_cwdb_uni(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -126,12 +126,3 @@
       return u2_cqdb_uni(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, by, uni)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, by, uni), Tier4, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/4/in.c b/gen164/4/in.c
deleted file mode 100644
index 9e43721ba2..0000000000
--- a/gen164/4/in.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/* j/4/in.c
-**
-** This file is in the public domain.
-*/
-#include "all.h"
-#include "../pit.h"
-
-/* declarations
-*/
-  extern u2_ho_jet j2_mcj(Pt4, in, gas)[];
-  extern u2_ho_jet j2_mcj(Pt4, in, has)[];
-  extern u2_ho_jet j2_mcj(Pt4, in, mer)[];
-  extern u2_ho_jet j2_mcj(Pt4, in, int)[];
-  extern u2_ho_jet j2_mcj(Pt4, in, put)[];
-  extern u2_ho_jet j2_mcj(Pt4, in, tap)[];
-  extern u2_ho_jet j2_mcj(Pt4, in, uni)[];
-
-/* structures
-*/
-  u2_ho_driver
-  j2_mbd(Pt4, in)[] = {
-    { j2_sc(Pt4, in, gas), j2_mcj(Pt4, in, gas), 0, 0, u2_none },
-    { j2_sc(Pt4, in, has), j2_mcj(Pt4, in, has), 0, 0, u2_none },
-    { j2_sc(Pt4, in, mer), j2_mcj(Pt4, in, mer), 0, 0, u2_none },
-    { j2_sc(Pt4, in, int), j2_mcj(Pt4, in, int), 0, 0, u2_none },
-    { j2_sc(Pt4, in, put), j2_mcj(Pt4, in, put), 0, 0, u2_none },
-    { j2_sc(Pt4, in, tap), j2_mcj(Pt4, in, tap), 0, 0, u2_none },
-    { j2_sc(Pt4, in, uni), j2_mcj(Pt4, in, uni), 0, 0, u2_none },
-    {}
-  };
-
-  u2_ho_jet
-  j2_mbj(Pt4, in)[] = {
-    { }
-  };
-
-  u2_ho_driver
-  j2_db(Pt4, in) =
-    { j2_sb(Pt4, in), j2_mbj(Pt4, in), j2_mbd(Pt4, in), 0, u2_none };
diff --git a/gen164/4/in_gas.c b/gen164/4/in_gas.c
index b90af73749..cb1ef81ecf 100644
--- a/gen164/4/in_gas.c
+++ b/gen164/4/in_gas.c
@@ -35,7 +35,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, in, gas)(
+  u2_cwdi_gas(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -46,11 +46,3 @@
       return u2_cqdi_gas(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, in, gas)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, in, gas), Tier4, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/in_has.c b/gen164/4/in_has.c
index 0235f3573b..a99db7e8a9 100644
--- a/gen164/4/in_has.c
+++ b/gen164/4/in_has.c
@@ -35,7 +35,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, in, has)(
+  u2_cwdi_has(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -46,11 +46,3 @@
       return u2_cqdi_has(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, in, has)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, in, has), Tier4, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/in_int.c b/gen164/4/in_int.c
index 6b736a6500..ad68be31bb 100644
--- a/gen164/4/in_int.c
+++ b/gen164/4/in_int.c
@@ -74,7 +74,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, in, int)(
+  u2_cwdi_int(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -85,13 +85,3 @@
       return u2_cqdi_int(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, in, int)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, in, int), Tier4, u2_none, u2_none },
-    { }
-  };
-
-
diff --git a/gen164/4/in_mer.c b/gen164/4/in_mer.c
index ad3bae60f8..ca3021a437 100644
--- a/gen164/4/in_mer.c
+++ b/gen164/4/in_mer.c
@@ -87,12 +87,3 @@
       return j2_mcc(Pt4, in, mer)(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, in, mer)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, in, mer), Tier4, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/4/in_put.c b/gen164/4/in_put.c
index 7059a8f051..2c55c755f2 100644
--- a/gen164/4/in_put.c
+++ b/gen164/4/in_put.c
@@ -81,7 +81,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, in, put)(
+  u2_cwdi_put(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -93,10 +93,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, in, put)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, in, put), Tier4, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/in_tap.c b/gen164/4/in_tap.c
index 63e2960151..12ab7bd0d5 100644
--- a/gen164/4/in_tap.c
+++ b/gen164/4/in_tap.c
@@ -37,7 +37,7 @@
     return _tap_in(a, u2k(b));
   }
   u2_weak                                                         //  produce
-  j2_mc(Pt4, in, tap)(
+  u2_cwdi_tap(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -48,11 +48,3 @@
       return u2_cqdi_tap(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, in, tap)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, in, tap), Tier4, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/4/in_uni.c b/gen164/4/in_uni.c
index d1774ad898..7ef600f781 100644
--- a/gen164/4/in_uni.c
+++ b/gen164/4/in_uni.c
@@ -117,7 +117,7 @@
     }
   }
   u2_weak                                                         //  transfer
-  j2_mc(Pt4, in, uni)(
+  u2_cwdi_uni(
                       u2_noun cor)                                //  retain
   {
     u2_noun a, b;
@@ -129,11 +129,3 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt4, in, uni)[] = {
-    { ".2", c3__lite, j2_mc(Pt4, in, uni), Tier4, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/5/aesc.c b/gen164/5/aesc.c
index ab9c6bd5a4..12611e0f66 100644
--- a/gen164/5/aesc.c
+++ b/gen164/5/aesc.c
@@ -11,11 +11,6 @@
 #include <openssl/aes.h>
 #endif
 
-/* declarations
-*/
-  extern u2_ho_jet j2_mcj(Pt5, aesc, en)[];
-  extern u2_ho_jet j2_mcj(Pt5, aesc, de)[];
-
 /* functions
 */
   u2_weak
@@ -129,27 +124,3 @@
       return j2_mcd(Pt5, aesc, de)(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt5, aesc, en)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, aesc, en), Tier5, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, aesc, de)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, aesc, de), Tier5, u2_none, u2_none },
-    { }
-  };
-
-  u2_ho_driver
-  j2_mbd(Pt5, aesc)[] = {
-    { j2_sc(Pt5, aesc, en), j2_mcj(Pt5, aesc, en), 0, 0, u2_none },
-    { j2_sc(Pt5, aesc, de), j2_mcj(Pt5, aesc, de), 0, 0, u2_none },
-    { }
-  };
-
-  u2_ho_driver
-  j2_db(Pt5, aesc) =
-    { j2_sb(Pt5, aesc), 0, j2_mbd(Pt5, aesc), 0, u2_none };
diff --git a/gen164/5/cue.c b/gen164/5/cue.c
index bc6b2df6d3..2fa07876d1 100644
--- a/gen164/5/cue.c
+++ b/gen164/5/cue.c
@@ -76,7 +76,7 @@
     return y;
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt5, cue)(u2_noun cor)                                    //  retain
+  u2_cwe_cue(u2_noun cor)                                    //  retain
   {
     u2_noun a;
 
@@ -86,11 +86,3 @@
       return u2_cqe_cue(a);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, cue)[] = {
-    { ".2", c3__hevy, j2_mb(Pt5, cue), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/ed.c b/gen164/5/ed.c
deleted file mode 100644
index 73d06d61b5..0000000000
--- a/gen164/5/ed.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* gen164/5/ed.c
-**
-** This file is in the public domain.
-*/
-#include "all.h"
-#include "../pit.h"
-
-/* declarations
-*/
-  extern u2_ho_jet j2_mdj(Pt5, coed, ed, sign)[];
-  extern u2_ho_jet j2_mdj(Pt5, coed, ed, puck)[];
-  extern u2_ho_jet j2_mdj(Pt5, coed, ed, veri)[];
-
-  u2_ho_driver
-  j2_mcd(Pt5, coed, ed)[] = {
-    { j2_sd(Pt5, coed, ed, sign), j2_mdj(Pt5, coed, ed, sign), 0, 0, u2_none },
-    { j2_sd(Pt5, coed, ed, puck), j2_mdj(Pt5, coed, ed, puck), 0, 0, u2_none },
-    { j2_sd(Pt5, coed, ed, veri), j2_mdj(Pt5, coed, ed, veri), 0, 0, u2_none },
-    {}
-  };
-
-/* structures
-*/
-  u2_ho_driver
-  j2_mbd(Pt5, coed)[] = {
-    { j2_sc(Pt5, coed, ed), 0, j2_mcd(Pt5, coed, ed), 0, u2_none },
-    {}
-  };
diff --git a/gen164/5/ed_puck.c b/gen164/5/ed_puck.c
index a379c47ec2..e5aa16db0f 100644
--- a/gen164/5/ed_puck.c
+++ b/gen164/5/ed_puck.c
@@ -33,10 +33,3 @@
     ed25519_create_keypair(pub_y, sec_y, sed_y);
     return u2_ci_bytes(32, pub_y);
   }
-/* structures
-*/
-  u2_ho_jet
-  j2_mdj(Pt5, coed, ed, puck)[] = {
-    { ".2", c3__lite, j2_md(Pt5, coed, ed, puck), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/ed_sign.c b/gen164/5/ed_sign.c
index b706c1879f..110e951137 100644
--- a/gen164/5/ed_sign.c
+++ b/gen164/5/ed_sign.c
@@ -51,10 +51,3 @@
       return j2_mcc(Pt5, ed, sign)(a, b);
     }
   }
-/* structures
-*/
-  u2_ho_jet
-  j2_mdj(Pt5, coed, ed, sign)[] = {
-    { ".2", c3__lite, j2_md(Pt5, coed, ed, sign), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/ed_veri.c b/gen164/5/ed_veri.c
index c96d458a72..5eab5549f4 100644
--- a/gen164/5/ed_veri.c
+++ b/gen164/5/ed_veri.c
@@ -48,11 +48,3 @@
       return j2_mdc(Pt5, coed, ed, veri)(a, b, c);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mdj(Pt5, coed, ed, veri)[] = {
-    { ".2", c3__lite, j2_md(Pt5, coed, ed, veri), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/jam.c b/gen164/5/jam.c
index 1a53452982..9d2e973a82 100644
--- a/gen164/5/jam.c
+++ b/gen164/5/jam.c
@@ -123,7 +123,7 @@
     return r;
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt5, jam)(u2_noun cor)                                    //  retain
+  u2_cwe_jam(u2_noun cor)                                    //  retain
   {
     u2_noun a;
 
@@ -133,11 +133,3 @@
       return u2_cqe_jam(a);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, jam)[] = {
-    { ".2", c3__hevy, j2_mb(Pt5, jam), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/lore.c b/gen164/5/lore.c
index 6b8e3efa8a..b93a3eb0e0 100644
--- a/gen164/5/lore.c
+++ b/gen164/5/lore.c
@@ -59,12 +59,3 @@
       return j2_mbc(Pt5, lore)(lub);
     }
   }
-
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, lore)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, lore), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/loss.c b/gen164/5/loss.c
index cbcd2b4374..8e16f33b38 100644
--- a/gen164/5/loss.c
+++ b/gen164/5/loss.c
@@ -297,12 +297,3 @@
       return j2_mbc(Pt5, loss)(hel, hev);
     }
   }
-
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, loss)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, loss), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/mat.c b/gen164/5/mat.c
index ba4e5ecbe0..3d9b1e020e 100644
--- a/gen164/5/mat.c
+++ b/gen164/5/mat.c
@@ -40,7 +40,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt5, mat)(
+  u2_cwe_mat(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a;
@@ -51,11 +51,3 @@
       return u2_cqe_mat(a);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, mat)[] = {
-    { ".2", c3__hevy, j2_mb(Pt5, mat), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/mink.c b/gen164/5/mink.c
index 7aed58efd3..362167673a 100644
--- a/gen164/5/mink.c
+++ b/gen164/5/mink.c
@@ -22,11 +22,3 @@
       return u2_cn_nock_in(u2k(bus), u2k(fol), u2k(fly));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, mink)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, mink), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/mule.c b/gen164/5/mule.c
index 5785dc0d7c..9312c31a86 100644
--- a/gen164/5/mule.c
+++ b/gen164/5/mule.c
@@ -23,11 +23,3 @@
       return u2_cn_slam_on(hok, u2k(tap));;
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, mule)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, mule), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/parse.c b/gen164/5/parse.c
index 122f5ce07f..110ee67892 100644
--- a/gen164/5/parse.c
+++ b/gen164/5/parse.c
@@ -87,7 +87,7 @@
 /* bend
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, bend, fun)(u2_noun raq,                             //  retain
+  _cqe_bend_fun(u2_noun raq,                             //  retain
                          u2_noun vex,                             //  retain
                          u2_noun sab)                             //  retain
   {
@@ -141,7 +141,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mc(Pt5, bend, fun)(u2_noun cor)                              //  retain
+  _cwe_bend_fun(u2_noun cor)                              //  retain
   {
     u2_noun van, raq, vex, sab;
 
@@ -152,19 +152,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, bend, fun)(raq, vex, sab);
+      return _cqe_bend_fun(raq, vex, sab);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, bend, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, bend, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* cold
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, cold, fun)(
+  _cqe_cold_fun(
                          u2_noun cus,                             //  retain
                          u2_noun sef,                             //  retain
                          u2_noun tub)                             //  retain
@@ -194,7 +189,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mc(Pt5, cold, fun)(
+  _cwe_cold_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, cus, sef, tub;
@@ -204,19 +199,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, cold, fun)(cus, sef, tub);
+      return _cqe_cold_fun(cus, sef, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, cold, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, cold, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* cook
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, cook, fun)(
+  _cqe_cook_fun(
                          u2_noun poq,                             //  retain
                          u2_noun sef,                             //  retain
                          u2_noun tub)                             //  retain
@@ -248,7 +238,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mc(Pt5, cook, fun)(
+  _cwe_cook_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, poq, sef, tub;
@@ -258,19 +248,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, cook, fun)(poq, sef, tub);
+      return _cqe_cook_fun(poq, sef, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, cook, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, cook, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* comp
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, comp, fun)(
+  _cqe_comp_fun(
                          u2_noun raq,                             //  retain
                          u2_noun vex,                             //  retain
                          u2_noun sab)                             //  retain
@@ -317,7 +302,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mc(Pt5, comp, fun)(
+  _cwe_comp_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, raq, vex, sab;
@@ -329,19 +314,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, comp, fun)(raq, vex, sab);
+      return _cqe_comp_fun(raq, vex, sab);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, comp, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, comp, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* easy
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, easy, fun)(
+  _cqe_easy_fun(
                          u2_noun huf,                             //  retain
                          u2_noun tub)                             //  retain
   {
@@ -354,7 +334,7 @@
                         u2k(tub));
   }
   u2_noun                                                         //  produce
-  j2_mc(Pt5, easy, fun)(
+  _cwe_easy_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, huf, tub;
@@ -364,19 +344,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, easy, fun)(huf, tub);
+      return _cqe_easy_fun(huf, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, easy, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, easy, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* glue
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, glue, fun)(
+  _cqe_glue_fun(
                          u2_noun bus,                             //  retain
                          u2_noun vex,                             //  retain
                          u2_noun sab)                             //  retain
@@ -436,7 +411,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mc(Pt5, glue, fun)(
+  _cwe_glue_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, bus, vex, sab;
@@ -448,19 +423,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, glue, fun)(bus, vex, sab);
+      return _cqe_glue_fun(bus, vex, sab);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, glue, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, glue, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* here
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, here, fun)(
+  _cqe_here_fun(
                          u2_noun hez,                             //  retain
                          u2_noun sef,                             //  retain
                          u2_noun tub)                             //  retain
@@ -500,7 +470,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mc(Pt5, here, fun)(
+  _cwe_here_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, hez, sef, tub;
@@ -510,19 +480,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, here, fun)(hez, sef, tub);
+      return _cqe_here_fun(hez, sef, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, here, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, here, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* just
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, just, fun)(
+  _cqe_just_fun(
                          u2_noun daf,                             //  retain
                          u2_noun tub)                             //  retain
   {
@@ -543,7 +508,7 @@
     }
   }
   u2_noun                                                         //  produce
-  j2_mc(Pt5, just, fun)(
+  _cwe_just_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, daf, tub;
@@ -553,19 +518,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, just, fun)(daf, tub);
+      return _cqe_just_fun(daf, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, just, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, just, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* mask
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, mask, fun)(
+  _cqe_mask_fun(
                          u2_noun bud,                             //  retain
                          u2_noun tub)                             //  retain
   {
@@ -589,7 +549,7 @@
     }
   }
   u2_noun                                                         //  produce
-  j2_mc(Pt5, mask, fun)(
+  _cwe_mask_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, bud, tub;
@@ -599,15 +559,9 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, mask, fun)(bud, tub);
+      return _cqe_mask_fun(bud, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, mask, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, mask, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
-
 /* pfix
 */
   u2_noun                                                         //  produce
@@ -828,7 +782,7 @@
 /* shim
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, shim, fun)(u2_noun zep,                             //  retain
+  _cqe_shim_fun(u2_noun zep,                             //  retain
                          u2_noun tub)                             //  retain
   {
     u2_noun p_tub, q_tub;
@@ -858,7 +812,7 @@
     }
   }
   u2_noun                                                         //  produce
-  j2_mc(Pt5, shim, fun)(
+  _cwe_shim_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, zep, tub;
@@ -868,19 +822,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, shim, fun)(zep, tub);
+      return _cqe_shim_fun(zep, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, shim, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, shim, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* stag
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, stag, fun)(
+  _cqe_stag_fun(
                          u2_noun gob,                             //  retain
                          u2_noun sef,                             //  retain
                          u2_noun tub)                             //  retain
@@ -912,7 +861,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mc(Pt5, stag, fun)(
+  _cwe_stag_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun van, gob, sef, tub;
@@ -922,14 +871,9 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, stag, fun)(gob, sef, tub);
+      return _cqe_stag_fun(gob, sef, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, stag, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, stag, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* stew
 */
@@ -960,7 +904,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, stew, fun)(
+  _cqe_stew_fun(
                          u2_noun hel,                             //  retain
                          u2_noun tub)                             //  retain
   {
@@ -1016,7 +960,7 @@
     }
   }
   u2_noun                                                         //  produce
-  j2_mc(Pt5, stew, fun)(
+  _cwe_stew_fun(
                         u2_noun cor)                              //  retain
   {
     u2_noun con, hel, tub;
@@ -1026,19 +970,14 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, stew, fun)(hel, tub);
+      return _cqe_stew_fun(hel, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, stew, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, stew, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
 
 /* stir
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt5, stir, fun)(u2_noun rud,                             //  retain
+  _cqe_stir_fun(u2_noun rud,                             //  retain
                          u2_noun raq,                             //  retain
                          u2_noun fel,                             //  retain
                          u2_noun tub)                             //  retain
@@ -1060,7 +999,7 @@
       u2_noun wag, p_wag, q_wag, uq_wag, puq_wag, quq_wag;
 
       u2_cx_cell(uq_vex, &puq_vex, &quq_vex);
-      wag = j2_mcx(Pt5, stir, fun)(rud, raq, fel, quq_vex);
+      wag = _cqe_stir_fun(rud, raq, fel, quq_vex);
 
       u2_cx_cell(wag, &p_wag, &q_wag);
       if ( u2_no == u2du(q_wag) ) {
@@ -1084,8 +1023,7 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mc(Pt5, stir, fun)(
-                        u2_noun cor)                              //  retain
+  _cwe_stir_fun(u2_noun cor)                              //  retain
   {
     u2_noun van, rud, raq, fel, tub;
 
@@ -1097,156 +1035,6 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt5, stir, fun)(rud, raq, fel, tub);
+      return _cqe_stir_fun(rud, raq, fel, tub);
     }
   }
-  u2_ho_jet
-  j2_mcj(Pt5, stir, fun)[] = {
-    { ".2", c3__hevy, j2_mc(Pt5, stir, fun), Tier5_b, u2_none, u2_none },
-    { }
-  };
-
-/* structures
-*/
-  /* bend
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, bend)[] = {
-      { j2_sc(Pt5, bend, fun), j2_mcj(Pt5, bend, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, bend) = { j2_sb(Pt5, bend), 0, j2_mbd(Pt5, bend), 0, u2_none };
-
-  /* cold
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, cold)[] = {
-      { j2_sc(Pt5, cold, fun), j2_mcj(Pt5, cold, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, cold) = { j2_sb(Pt5, cold), 0, j2_mbd(Pt5, cold), 0, u2_none };
-
-  /* comp
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, comp)[] = {
-      { j2_sc(Pt5, comp, fun), j2_mcj(Pt5, comp, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, comp) = { j2_sb(Pt5, comp), 0, j2_mbd(Pt5, comp), 0, u2_none };
-
-  /* cook
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, cook)[] = {
-      { j2_sc(Pt5, cook, fun), j2_mcj(Pt5, cook, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, cook) = { j2_sb(Pt5, cook), 0, j2_mbd(Pt5, cook), 0, u2_none };
-
-  /* easy
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, easy)[] = {
-      { j2_sc(Pt5, easy, fun), j2_mcj(Pt5, easy, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, easy) = { j2_sb(Pt5, easy), 0, j2_mbd(Pt5, easy), 0, u2_none };
-
-  /* glue
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, glue)[] = {
-      { j2_sc(Pt5, glue, fun), j2_mcj(Pt5, glue, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, glue) = { j2_sb(Pt5, glue), 0, j2_mbd(Pt5, glue), 0, u2_none };
-
-  /* here
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, here)[] = {
-      { j2_sc(Pt5, here, fun), j2_mcj(Pt5, here, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, here) = { j2_sb(Pt5, here), 0, j2_mbd(Pt5, here), 0, u2_none };
-
-  /* just
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, just)[] = {
-      { j2_sc(Pt5, just, fun), j2_mcj(Pt5, just, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, just) = { j2_sb(Pt5, just), 0, j2_mbd(Pt5, just), 0, u2_none };
-
-  /* mask
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, mask)[] = {
-      { j2_sc(Pt5, mask, fun), j2_mcj(Pt5, mask, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, mask) = { j2_sb(Pt5, mask), 0, j2_mbd(Pt5, mask), 0, u2_none };
-
-  /* shim
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, shim)[] = {
-      { j2_sc(Pt5, shim, fun), j2_mcj(Pt5, shim, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, shim) = { j2_sb(Pt5, shim), 0, j2_mbd(Pt5, shim), 0, u2_none };
-
-  /* stag
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, stag)[] = {
-      { j2_sc(Pt5, stag, fun), j2_mcj(Pt5, stag, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, stag) = { j2_sb(Pt5, stag), 0, j2_mbd(Pt5, stag), 0, u2_none };
-
-  /* stew
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, stew)[] = {
-      { j2_sc(Pt5, stew, fun), j2_mcj(Pt5, stew, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, stew) = { j2_sb(Pt5, stew), 0, j2_mbd(Pt5, stew), 0, u2_none };
-
-  /* stir
-  */
-    u2_ho_driver
-    j2_mbd(Pt5, stir)[] = {
-      { j2_sc(Pt5, stir, fun), j2_mcj(Pt5, stir, fun), 0, 0, u2_none },
-      { }
-    };
-
-    u2_ho_driver
-    j2_db(Pt5, stir) = { j2_sb(Pt5, stir), 0, j2_mbd(Pt5, stir), 0, u2_none };
diff --git a/gen164/5/rd.c b/gen164/5/rd.c
index be3ce9aee7..9dea7eb1b7 100644
--- a/gen164/5/rd.c
+++ b/gen164/5/rd.c
@@ -10,17 +10,6 @@ union doub {
   c3_d c;
 };
 
-/* declarations
-*/
-  extern u2_ho_jet j2_mcj(Pt5, rd, sun)[];
-  extern u2_ho_jet j2_mcj(Pt5, rd, mul)[];
-  extern u2_ho_jet j2_mcj(Pt5, rd, div)[];
-  extern u2_ho_jet j2_mcj(Pt5, rd, add)[];
-  extern u2_ho_jet j2_mcj(Pt5, rd, sub)[];
-  extern u2_ho_jet j2_mcj(Pt5, rd, lte)[];
-  extern u2_ho_jet j2_mcj(Pt5, rd, lth)[];
-  extern u2_ho_jet j2_mcj(Pt5, rd, gte)[];
-  extern u2_ho_jet j2_mcj(Pt5, rd, gth)[];
 
 /* functions
 */
@@ -302,69 +291,3 @@ union doub {
       return j2_mcd(Pt5, rd, gth)(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt5, rd, sun)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, sun), Tier5_test, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, rd, mul)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, mul), Tier5_test, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, rd, div)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, div), Tier5_test, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, rd, add)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, add), Tier5_test, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, rd, sub)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, sub), Tier5_test, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, rd, lte)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, lte), Tier5_test, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, rd, lth)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, lth), Tier5_test, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, rd, gte)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, gte), Tier5_test, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mcj(Pt5, rd, gth)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, rd, gth), Tier5_test, u2_none, u2_none },
-    { }
-  };
-
-  u2_ho_driver
-  j2_mbd(Pt5, rd)[] = {
-    { j2_sc(Pt5, rd, sun), j2_mcj(Pt5, rd, sun), 0, 0, u2_none },
-    { j2_sc(Pt5, rd, mul), j2_mcj(Pt5, rd, mul), 0, 0, u2_none },
-    { j2_sc(Pt5, rd, div), j2_mcj(Pt5, rd, div), 0, 0, u2_none },
-    { j2_sc(Pt5, rd, add), j2_mcj(Pt5, rd, add), 0, 0, u2_none },
-    { j2_sc(Pt5, rd, sub), j2_mcj(Pt5, rd, sub), 0, 0, u2_none },
-    { j2_sc(Pt5, rd, lte), j2_mcj(Pt5, rd, lte), 0, 0, u2_none },
-    { j2_sc(Pt5, rd, lth), j2_mcj(Pt5, rd, lth), 0, 0, u2_none },
-    { j2_sc(Pt5, rd, gte), j2_mcj(Pt5, rd, gte), 0, 0, u2_none },
-    { j2_sc(Pt5, rd, gth), j2_mcj(Pt5, rd, gth), 0, 0, u2_none },
-    { }
-  };
-
-  u2_ho_driver
-  j2_db(Pt5, rd) =
-    { j2_sb(Pt5, rd), 0, j2_mbd(Pt5, rd), 0, u2_none };
diff --git a/gen164/5/repg.c b/gen164/5/repg.c
index 9f271bc73a..52af6f0625 100644
--- a/gen164/5/repg.c
+++ b/gen164/5/repg.c
@@ -141,12 +141,3 @@
       return j2_mbc(Pt5, repg)(lub, rad, rep);
     }
   }
-
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, repg)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, repg), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/rexp.c b/gen164/5/rexp.c
index fb04ff5f44..6287cea37c 100644
--- a/gen164/5/rexp.c
+++ b/gen164/5/rexp.c
@@ -140,12 +140,3 @@
       return j2_mbc(Pt5, rexp)(lub, rad);
     }
   }
-
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, rexp)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, rexp), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/rub.c b/gen164/5/rub.c
index 17bf787da9..eb46e7080a 100644
--- a/gen164/5/rub.c
+++ b/gen164/5/rub.c
@@ -66,7 +66,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt5, rub)(
+  u2_cwe_rub(
                   u2_noun cor)                                    //  retain
   {
     u2_noun a, b;
@@ -80,11 +80,3 @@
       return u2_cqe_rub(a, b);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, rub)[] = {
-    { ".2", c3__hevy, j2_mb(Pt5, rub), Tier5, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/shax.c b/gen164/5/shax.c
index 5213e206aa..5aea8fef54 100644
--- a/gen164/5/shax.c
+++ b/gen164/5/shax.c
@@ -195,40 +195,3 @@
       return j2_mcc(Pt5, og, raw)(a, b);
     }
   }
-
-
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, shax)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, shax), Tier5, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mbj(Pt5, shal)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, shal), Tier5, u2_none, u2_none },
-    { }
-  };
-  u2_ho_jet
-  j2_mbj(Pt5, shas)[] = {
-    { ".2", c3__lite, j2_mb(Pt5, shas), Tier5, u2_none, u2_none },
-    { }
-  };
-
-  u2_ho_jet
-  j2_mcj(Pt5, og, raw)[] = {
-    { ".2", c3__lite, j2_mc(Pt5, og, raw), Tier5, u2_none, u2_none },
-    { }
-  };
-
-  u2_ho_driver
-  j2_mbd(Pt5, og)[] = {
-    { j2_sc(Pt5, og, raw), j2_mcj(Pt5, og, raw), 0, 0, u2_none },
-    {}
-  };
-
-  u2_ho_driver
-  j2_db(Pt5, og) =
-    { j2_sb(Pt5, og), 0, j2_mbd(Pt5, og), 0, u2_none };
-
diff --git a/gen164/5/tape.c b/gen164/5/tape.c
index 50de39ca18..58d8a5760f 100644
--- a/gen164/5/tape.c
+++ b/gen164/5/tape.c
@@ -57,11 +57,3 @@
       return j2_mby(PtM, tape)(a);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(PtM, tape)[] = {
-    { ".2", c3__hevy, j2_mb(PtM, tape), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/5/trip.c b/gen164/5/trip.c
index a7c8ad16f6..f88d6332a4 100644
--- a/gen164/5/trip.c
+++ b/gen164/5/trip.c
@@ -27,11 +27,3 @@
       return u2_cqc_trip(a);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt5, trip)[] = {
-    { ".2", c3__hevy, j2_mb(Pt5, trip), Tier3, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/ap.c b/gen164/6/ap.c
index e20b7a0fe4..842144427e 100644
--- a/gen164/6/ap.c
+++ b/gen164/6/ap.c
@@ -16,9 +16,9 @@
     u2_noun
     j2_mcy(Pt6, ap, mold)(u2_noun, u2_noun);
 
-    u2_noun j2_mc(Pt6, ap, rake)(u2_noun);
-    u2_noun j2_mc(Pt6, ap, open)(u2_noun);
-    u2_noun j2_mc(Pt6, ap, hack)(u2_noun);
+    u2_noun u2_cwfp_rake(u2_noun);
+    u2_noun u2_cwfp_open(u2_noun);
+    u2_noun u2_cwfp_hack(u2_noun);
 
     static u2_noun
     _ap_open_l(u2_noun, u2_noun);
@@ -31,9 +31,9 @@
 
     u2_ho_jet
     j2_mbj(Pt6, ap)[] = {
-      { "open", c3__hevy, j2_mc(Pt6, ap, open), Tier6_c, u2_none, u2_none },
-      { "rake", c3__hevy, j2_mc(Pt6, ap, rake), Tier6_c, u2_none, u2_none },
-      // { "hack", c3__hevy, j2_mc(Pt6, ap, hack), Tier6_c, u2_none, u2_none },
+      { "open", c3__hevy, u2_cwfp_open, Tier6_c, u2_none, u2_none },
+      { "rake", c3__hevy, u2_cwfp_rake, Tier6_c, u2_none, u2_none },
+      // { "hack", c3__hevy, u2_cwfp_hack, Tier6_c, u2_none, u2_none },
       { }
     };
 
@@ -736,6 +736,7 @@
 				    u2nc(c3__cnzy, c3__c))))));
   }
 #endif
+
 /* functions
 */
   /** open
@@ -908,7 +909,7 @@
       }
     }
     u2_noun                                                       //  transfer
-    j2_mc(Pt6, ap, rake)(
+    u2_cwfp_rake(
                          u2_noun cor)                             //  retain
     {
       u2_noun gen;
@@ -1011,7 +1012,7 @@
     }
 
     u2_noun                                                       //  transfer
-    j2_mc(Pt6, ap, hack)(
+    u2_cwfp_hack(
                          u2_noun cor)                             //  retain
     {
       u2_noun gen;
@@ -1101,7 +1102,7 @@
   }
 
   u2_noun                                                       //  transfer
-  j2_mc(Pt6, ap, open)(
+  u2_cwfp_open(
                        u2_noun cor)                             //  retain
   {
     u2_noun gen;
@@ -1114,10 +1115,3 @@
       return u2_cqfp_open(ter, gen);
     }
   }
-
-/* structures
-*/
-  u2_ho_driver
-  j2_mbd(Pt6, ap)[] = {
-    { }
-  };
diff --git a/gen164/6/bull.c b/gen164/6/bull.c
index 5aa18e4d03..66c89dc0cd 100644
--- a/gen164/6/bull.c
+++ b/gen164/6/bull.c
@@ -21,7 +21,7 @@
       (c3__bull, u2k(bid), u2k(der));
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, bull)(
+  u2_cwf_bull(
                    u2_noun cor)                                   //  retain
   {
     u2_noun bid, der;
@@ -32,11 +32,3 @@
       return u2_cqf_bull(bid, der);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, bull)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, bull), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/cell.c b/gen164/6/cell.c
index d4a1f068b7..42f1f5ac82 100644
--- a/gen164/6/cell.c
+++ b/gen164/6/cell.c
@@ -19,7 +19,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, cell)(
+  u2_cwf_cell(
                    u2_noun cor)                                   //  retain
   {
     u2_noun hed, tal;
@@ -30,11 +30,3 @@
       return u2_cqf_cell(hed, tal);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, cell)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, cell), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/comb.c b/gen164/6/comb.c
index 5532d59948..9286fb9bc7 100644
--- a/gen164/6/comb.c
+++ b/gen164/6/comb.c
@@ -59,7 +59,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, comb)(
+  u2_cwf_comb(
                    u2_noun cor)                                   //  retain
   {
     u2_noun mal, buz;
@@ -70,11 +70,3 @@
       return u2_cqf_comb(mal, buz);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, comb)[] = {
-    { ".2", c3__lite, j2_mb(Pt6, comb), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/cons.c b/gen164/6/cons.c
index 20db9b8f0c..fb69da80db 100644
--- a/gen164/6/cons.c
+++ b/gen164/6/cons.c
@@ -42,7 +42,7 @@
     return u2nc(u2k(vur), u2k(sed));
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, cons)(
+  u2_cwf_cons(
                    u2_noun cor)                                   //  retain
   {
     u2_noun vur, sed;
@@ -53,11 +53,3 @@
       return u2_cqf_cons(vur, sed);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, cons)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, cons), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/core.c b/gen164/6/core.c
index 43cd3cb687..43a94d7159 100644
--- a/gen164/6/core.c
+++ b/gen164/6/core.c
@@ -19,7 +19,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, core)(
+  u2_cwf_core(
                    u2_noun cor)                                   //  retain
   {
     u2_noun pac, con;
@@ -30,11 +30,3 @@
       return u2_cqf_core(pac, con);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, core)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, core), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/cube.c b/gen164/6/cube.c
index cd65083d74..b1a81a866a 100644
--- a/gen164/6/cube.c
+++ b/gen164/6/cube.c
@@ -19,7 +19,7 @@
       (c3__cube, u2k(dil), u2k(goq));
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, cube)(
+  u2_cwf_cube(
                    u2_noun cor)                                   //  retain
   {
     u2_noun dil, goq;
@@ -30,11 +30,3 @@
       return u2_cqf_cube(dil, goq);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, cube)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, cube), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/face.c b/gen164/6/face.c
index 564933ebb9..9559cb2c1d 100644
--- a/gen164/6/face.c
+++ b/gen164/6/face.c
@@ -19,7 +19,7 @@
       (c3__face, u2k(cog), u2k(tip));
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, face)(
+  u2_cwf_face(
                    u2_noun cor)                                   //  retain
   {
     u2_noun cog, tip;
@@ -30,11 +30,3 @@
       return u2_cqf_face(cog, tip);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, face)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, face), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/fine.c b/gen164/6/fine.c
index b7ec0e79bf..454d13195f 100644
--- a/gen164/6/fine.c
+++ b/gen164/6/fine.c
@@ -22,7 +22,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, fine)(
+  u2_cwf_fine(
                    u2_noun cor)                                   //  retain
   {
     u2_noun fuv, lup, mar;
@@ -35,11 +35,3 @@
       return u2_cqf_fine(fuv, lup, mar);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, fine)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, fine), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/fitz.c b/gen164/6/fitz.c
index 7b59d40d16..39824a5ba8 100644
--- a/gen164/6/fitz.c
+++ b/gen164/6/fitz.c
@@ -55,7 +55,7 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, fitz)(
+  u2_cwf_fitz(
                    u2_noun cor)                                   //  retain
   {
     u2_noun yaz, wix;
@@ -69,11 +69,3 @@
       return u2_cqf_fitz(yaz, wix);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, fitz)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, fitz), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/flan.c b/gen164/6/flan.c
index 1f3fdbbd8e..b17538701c 100644
--- a/gen164/6/flan.c
+++ b/gen164/6/flan.c
@@ -35,7 +35,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, flan)(
+  u2_cwf_flan(
                    u2_noun cor)                                   //  retain
   {
     u2_noun bos, nif;
@@ -46,11 +46,3 @@
       return u2_cqf_flan(bos, nif);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, flan)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, flan), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/flay.c b/gen164/6/flay.c
index bf15b87364..e86271790b 100644
--- a/gen164/6/flay.c
+++ b/gen164/6/flay.c
@@ -42,7 +42,7 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, flay)(
+  u2_cwf_flay(
                    u2_noun cor)                                   //  retain
   {
     u2_noun pok;
@@ -54,11 +54,3 @@
       return u2_cqf_flay(pok);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, flay)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, flay), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/flip.c b/gen164/6/flip.c
index 86d6eef6f0..5f59fecbeb 100644
--- a/gen164/6/flip.c
+++ b/gen164/6/flip.c
@@ -30,7 +30,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, flip)(
+  u2_cwf_flip(
                    u2_noun cor)                                   //  retain
   {
     u2_noun hel;
@@ -41,11 +41,3 @@
       return u2_cqf_flip(hel);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, flip)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, flip), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/flor.c b/gen164/6/flor.c
index 700436fd6d..d64361badc 100644
--- a/gen164/6/flor.c
+++ b/gen164/6/flor.c
@@ -35,7 +35,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, flor)(
+  u2_cwf_flor(
                    u2_noun cor)                                   //  retain
   {
     u2_noun bos, nif;
@@ -46,11 +46,3 @@
       return u2_cqf_flor(bos, nif);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, flor)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, flor), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/fork.c b/gen164/6/fork.c
index f6dea85934..9bed4a9b76 100644
--- a/gen164/6/fork.c
+++ b/gen164/6/fork.c
@@ -25,7 +25,7 @@
       (c3__fork, u2k(hoz), u2k(bur));
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, fork)(
+  u2_cwf_fork(
                    u2_noun cor)                                   //  retain
   {
     u2_noun hoz, bur;
@@ -36,11 +36,3 @@
       return u2_cqf_fork(hoz, bur);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, fork)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, fork), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/hike.c b/gen164/6/hike.c
index 1c4986ee4e..aec392e60a 100644
--- a/gen164/6/hike.c
+++ b/gen164/6/hike.c
@@ -130,7 +130,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, hike)(
+  u2_cwf_hike(
                    u2_noun cor)                                   //  retain
   {
     u2_noun axe, pac;
@@ -143,11 +143,3 @@
       return u2_cqf_hike(axe, pac);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, hike)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, hike), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/look.c b/gen164/6/look.c
index 0d61157ae8..ec5f366d1d 100644
--- a/gen164/6/look.c
+++ b/gen164/6/look.c
@@ -121,7 +121,7 @@
     return _look_in(cog, dab, 1);
   }
   u2_noun                                                         //  transfer
-  j2_mb(Pt6, look)(
+  u2_cwf_look(
                    u2_noun cor)                                   //  retain
   {
     u2_noun cog, dab;
@@ -132,11 +132,3 @@
       return u2_cqf_look(cog, dab);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, look)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, look), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/slot.c b/gen164/6/slot.c
index fe734855ae..d6d11211ed 100644
--- a/gen164/6/slot.c
+++ b/gen164/6/slot.c
@@ -56,11 +56,3 @@
       return j2_mby(Pt6, slot)(axe, vax);
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, slot)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, slot), u2_jet_live | u2_jet_test, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/spec.c b/gen164/6/spec.c
deleted file mode 100644
index 7b59d40d16..0000000000
--- a/gen164/6/spec.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/* j/6/fitz.c
-**
-** This file is in the public domain.
-*/
-#include "all.h"
-#include "../pit.h"
-
-/* functions
-*/
-  static u2_bean
-  _fitz_fiz(
-            u2_noun yaz,
-            u2_noun wix)
-  {
-    c3_w yaz_w = u2_cr_met(3, yaz);
-    c3_w wix_w = u2_cr_met(3, wix);
-    c3_y yaz_y, wix_y;
-
-    yaz_y = (0 == yaz_w) ? 0 : u2_cr_byte((yaz_w - 1), yaz);
-    if ( (yaz_y < 'A') || (yaz_y > 'Z') ) yaz_y = 0;
-
-    wix_y = (0 == wix_w) ? 0 : u2_cr_byte((wix_w - 1), wix);
-    if ( (wix_y < 'A') || (wix_y > 'Z') ) wix_y = 0;
-
-    if ( yaz_y && wix_y ) {
-      if ( !wix_y || (wix_y > yaz_y) ) {
-        return u2_no;
-      }
-    }
-    return u2_yes;
-  }
-
-  u2_noun                                                         //  transfer
-  u2_cqf_fitz(
-                    u2_noun yaz,                                  //  retain
-                    u2_noun wix)                                  //  retain
-  {
-    c3_w i_w, met_w = c3_min(u2_cr_met(3, yaz), u2_cr_met(3, wix));
-
-    if ( u2_no == _fitz_fiz(yaz, wix) ) {
-      return u2_no;
-    }
-    for ( i_w = 0; i_w < met_w; i_w++ ) {
-      c3_y yaz_y = u2_cr_byte(i_w, yaz);
-      c3_y wix_y = u2_cr_byte(i_w, wix);
-
-      if ( (yaz_y >= 'A') && (yaz_y <= 'Z') ) yaz_y = 0;
-      if ( (wix_y >= 'A') && (wix_y <= 'Z') ) wix_y = 0;
-
-      if ( yaz_y && wix_y && (yaz_y != wix_y) ) {
-        return u2_no;
-      }
-    }
-    return u2_yes;
-  }
-
-  u2_noun                                                         //  transfer
-  j2_mb(Pt6, fitz)(
-                   u2_noun cor)                                   //  retain
-  {
-    u2_noun yaz, wix;
-
-    if ( (u2_no == u2_cr_mean(cor, u2_cv_sam_2, &yaz, u2_cv_sam_3, &wix, 0)) ||
-         (u2_no == u2ud(yaz)) ||
-         (u2_no == u2ud(wix)) )
-    {
-      return u2_cm_bail(c3__fail);
-    } else {
-      return u2_cqf_fitz(yaz, wix);
-    }
-  }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mbj(Pt6, fitz)[] = {
-    { ".2", c3__hevy, j2_mb(Pt6, fitz), Tier6_a, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/ut.c b/gen164/6/ut.c
index 90cf9807fc..8aa71c44a5 100644
--- a/gen164/6/ut.c
+++ b/gen164/6/ut.c
@@ -5,31 +5,6 @@
 #include "all.h"
 #include "../pit.h"
 
-/* debugging hacks
-*/
-#if 0
-  static void
-  _dump_wall(
-             const c3_c* cap_c,
-             u2_noun     wal)
-  {
-    if ( cap_c ) printf("%s:\n", cap_c);
-
-    while ( u2_nul != wal ) {
-      u2_noun h_wal = u2h(wal);
-
-      while ( u2_nul != h_wal ) {
-        c3_assert(u2h(h_wal) < 128);
-
-        putchar(u2h(h_wal));
-        h_wal = u2t(h_wal);
-      }
-      putchar(10);
-      wal = u2t(wal);
-    }
-  }
-#endif
-
   //  duck: create a duck core for mean.
   //
   u2_noun                                                         //  produce
@@ -111,96 +86,3 @@
                         u2nc(u2k(sty), mol)));
   }
 
-/* declarations
-*/
-  u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, repo)(
-                       u2_noun cor);                              //  retain
-  u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, burn)(
-                       u2_noun cor);                              //  retain
-  u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, moot)(
-                       u2_noun cor);                              //  retain
-
-  u2_weak
-  j2_mck(Pt6, ut, moot)(
-                        u2_noun cor);                             //  retain
-
-  extern u2_ho_jet j2_mcj(Pt6, ut, busk)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, bust)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, crop)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, cull)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, find)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, fink)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, fino)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, fire)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, firm)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, fish)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, fuse)[];
-  // extern u2_ho_jet j2_mcj(Pt6, ut, gain)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, heal)[];
-  // extern u2_ho_jet j2_mcj(Pt6, ut, lose)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, mint)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, mull)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, nest)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, park)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, peek)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, play)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, rest)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, seek)[];
-  // extern u2_ho_jet j2_mcj(Pt6, ut, sift)[];
-  // extern u2_ho_jet j2_mcj(Pt6, ut, tack)[];
-  extern u2_ho_jet j2_mcj(Pt6, ut, tock)[];
-
-/* structures
-*/
-  u2_ho_driver
-  j2_mbd(Pt6, ut)[] = {
-    { j2_sc(Pt6, ut, busk), j2_mcj(Pt6, ut, busk), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, bust), j2_mcj(Pt6, ut, bust), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, crop), j2_mcj(Pt6, ut, crop), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, cull), j2_mcj(Pt6, ut, cull), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, find), j2_mcj(Pt6, ut, find), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, fino), j2_mcj(Pt6, ut, fino), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, fire), j2_mcj(Pt6, ut, fire), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, firm), j2_mcj(Pt6, ut, firm), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, fish), j2_mcj(Pt6, ut, fish), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, fuse), j2_mcj(Pt6, ut, fuse), 0, 0, u2_none },
-    // { j2_sc(Pt6, ut, gain), j2_mcj(Pt6, ut, gain), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, heal), j2_mcj(Pt6, ut, heal), 0, 0, u2_none },
-    // { j2_sc(Pt6, ut, lose), j2_mcj(Pt6, ut, lose), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, mint), j2_mcj(Pt6, ut, mint), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, mull), j2_mcj(Pt6, ut, mull), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, nest), j2_mcj(Pt6, ut, nest), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, park), j2_mcj(Pt6, ut, park), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, peek), j2_mcj(Pt6, ut, peek), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, play), j2_mcj(Pt6, ut, play), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, rest), j2_mcj(Pt6, ut, rest), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, seek), j2_mcj(Pt6, ut, seek), 0, 0, u2_none },
-    // { j2_sc(Pt6, ut, sift), j2_mcj(Pt6, ut, sift), 0, 0, u2_none },
-    // { j2_sc(Pt6, ut, tack), j2_mcj(Pt6, ut, tack), 0, 0, u2_none },
-    { j2_sc(Pt6, ut, tock), j2_mcj(Pt6, ut, tock), 0, 0, u2_none },
-    { }
-  };
-
-  u2_ho_jet
-  j2_mbj(Pt6, ut)[] = {
-    { "burn",
-      c3__hevy,
-      j2_mc(Pt6, ut, burn),
-      Tier6_b,
-      u2_none, u2_none },
-    { "moot",
-      c3__hevy,
-      j2_mc(Pt6, ut, moot),
-      Tier6_b_memo,
-      u2_none, u2_none,
-      j2_mck(Pt6, ut, moot), c3__moot },
-    { "repo", c3__hevy, j2_mc(Pt6, ut, repo), Tier6_b, u2_none, u2_none },
-    { }
-  };
-
-  u2_ho_driver
-  j2_db(Pt6, ut) =
-    { j2_sb(Pt6, ut), j2_mbj(Pt6, ut), j2_mbd(Pt6, ut), 0, u2_none };
diff --git a/gen164/6/ut_burn.c b/gen164/6/ut_burn.c
index 65bc0dfc2d..fded2fd0be 100644
--- a/gen164/6/ut_burn.c
+++ b/gen164/6/ut_burn.c
@@ -80,43 +80,33 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, burn)(
+  _cqfu_burn(
                         u2_noun van,                              //  retain
                         u2_noun sut)                              //  retain
   {
     return _burn_in(van, sut, u2_nul);
   }
 
-  extern u2_ho_jet
-  j2_mbj(Pt6, ut)[];
-
   u2_noun                                                         //  transfer
   u2_cqfu_burn(
                         u2_noun van,                              //  retain
                         u2_noun sut)                              //  retain
   {
-    u2_ho_jet *jet_j = &j2_mbj(Pt6, ut)[0];   //  total hack
+    c3_m    fun_m = c3__burn;
+    u2_noun pro   = u2_cz_find(fun_m, sut);
 
-    if ( !(jet_j->sat_s & u2_jet_memo) ) {
-      return j2_mcx(Pt6, ut, burn)(van, sut);
+    if ( u2_none != pro ) {
+      return pro;
     }
     else {
-      c3_m    fun_m = c3__burn;
-      u2_noun pro   = u2_cz_find(fun_m, sut);
+      pro = _cqfu_burn(van, sut);
 
-      if ( u2_none != pro ) {
-        return pro;
-      }
-      else {
-        pro = j2_mcx(Pt6, ut, burn)(van, sut);
-
-        return u2_cz_save(fun_m, sut, pro);
-      }
+      return u2_cz_save(fun_m, sut, pro);
     }
   }
 
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, burn)(
+  u2_cwfu_burn(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut;
diff --git a/gen164/6/ut_busk.c b/gen164/6/ut_busk.c
index a37e2c37ff..38a34a73e9 100644
--- a/gen164/6/ut_busk.c
+++ b/gen164/6/ut_busk.c
@@ -5,13 +5,10 @@
 #include "all.h"
 #include "../pit.h"
 
-    u2_ho_jet
-    j2_mcj(Pt6, ut, busk)[];
-
 /* logic
 */
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, busk)(
+  _cqfu_busk(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun cog,                              //  retain
@@ -29,7 +26,7 @@
 /* boilerplate
 */
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, busk)(u2_noun cor)                               //  retain
+  u2_cwfu_busk(u2_noun cor)                               //  retain
   {
     u2_noun sut, cog, hyp, van;
 
@@ -42,7 +39,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, busk)(van, sut, cog, hyp);
+      return _cqfu_busk(van, sut, cog, hyp);
     }
   }
 
@@ -52,7 +49,7 @@
                         u2_noun cog,                              //  retain
                         u2_noun hyp)                              //  retain
   {
-    return j2_mcx(Pt6, ut, busk)(van, sut, cog, hyp);
+    return _cqfu_busk(van, sut, cog, hyp);
   }
 
   u2_weak
@@ -68,16 +65,3 @@
       return u2nc(u2k(sut), u2k(hyp));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, busk)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, busk),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, busk), c3__busk,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_bust.c b/gen164/6/ut_bust.c
index fbf2aafe97..3f70f387fa 100644
--- a/gen164/6/ut_bust.c
+++ b/gen164/6/ut_bust.c
@@ -8,7 +8,7 @@
 /* logic
 */
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, bust)(
+  _cqfu_bust(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun dib)                              //  retain
@@ -35,11 +35,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, bust)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, bust)(u2_noun cor)                               //  retain
+  u2_cwfu_bust(u2_noun cor)                               //  retain
   {
     u2_noun sut, dib, van;
 
@@ -48,7 +45,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, bust)(van, sut, dib);
+      return _cqfu_bust(van, sut, dib);
     }
   }
 
@@ -58,7 +55,7 @@
                         u2_noun dib)                              //  retain
   {
 #if 1
-    return j2_mcx(Pt6, ut, bust)(van, sut, dib);
+    return _cqfu_bust(van, sut, dib);
 #else
     c3_m    fun_m = c3__bust;
     u2_noun pro   = u2_cz_find_2(fun_m, sut, dib);
@@ -67,7 +64,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, bust)(van, sut, dib);
+      pro = _cqfu_bust(van, sut, dib);
 
       return u2_cz_save_2(fun_m, sut, dib, pro);
     }
@@ -87,16 +84,3 @@
       return u2nc(u2k(sut), u2k(dib));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, bust)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, bust),
-        Tier6_b,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, bust), c3__bust,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_conk.c b/gen164/6/ut_conk.c
index 70dc24ee14..b54e1b9435 100644
--- a/gen164/6/ut_conk.c
+++ b/gen164/6/ut_conk.c
@@ -8,7 +8,7 @@
 /* logic
 */
   u2_bean                                                         //  transfer
-  j2_mcx(Pt6, ut, conk)(
+  _cqfu_conk(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun got)                              //  retain
@@ -25,10 +25,10 @@
       case 1: {
         return u2_cqf_face
           (u2h(u2t(got)),
-                 j2_mcx(Pt6, ut, conk)(van, sut, u2t(u2t(got))));
+                 _cqfu_conk(van, sut, u2t(u2t(got))));
       }
       case 2: {
-        u2_bean vet = u2_cr_at(j2_ut_van_vet, van);
+        u2_bean vet = u2_cr_at(u2_cqfu_van_vet, van);
         u2_noun hed, tal, ret;
 
         if ( u2_yes == vet ) {
@@ -44,8 +44,8 @@
 
         ret = u2_cqf_cell
           (
-           j2_mcx(Pt6, ut, conk)(van, hed, u2h(u2t(got))),
-           j2_mcx(Pt6, ut, conk)(van, tal, u2t(u2t(got))));
+           _cqfu_conk(van, hed, u2h(u2t(got))),
+           _cqfu_conk(van, tal, u2t(u2t(got))));
 
         u2z(hed);
         u2z(tal);
@@ -57,11 +57,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, conk)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, conk)(u2_noun cor)                               //  retain
+  u2_cwfu_conk(u2_noun cor)                               //  retain
   {
     u2_noun sut, got, van;
 
@@ -72,7 +69,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, conk)(van, sut, got);
+      return _cqfu_conk(van, sut, got);
     }
   }
 
@@ -81,14 +78,6 @@
                         u2_noun sut,                              //  retain
                         u2_noun got)                              //  retain
   {
-    return j2_mcx(Pt6, ut, conk)(van, sut, got);
+    return _cqfu_conk(van, sut, got);
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, conk)[] = {
-    { ".2", c3__hevy, j2_mc(Pt6, ut, conk), Tier6_b, u2_none, u2_none },
-    { }
-  };
-
diff --git a/gen164/6/ut_crop.c b/gen164/6/ut_crop.c
index ee8dc328f2..4a8d8ad6f7 100644
--- a/gen164/6/ut_crop.c
+++ b/gen164/6/ut_crop.c
@@ -219,7 +219,7 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, crop)(
+  _cqfu_crop(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun ref)                              //  retain
@@ -229,11 +229,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, crop)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, crop)(
+  u2_cwfu_crop(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, ref, van;
@@ -243,7 +240,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, crop)(van, sut, ref);
+      return _cqfu_crop(van, sut, ref);
     }
   }
 
@@ -259,7 +256,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, crop)(van, sut, ref);
+      pro = _cqfu_crop(van, sut, ref);
 
       return u2_cz_save_2(fun_m, sut, ref, pro);
     }
@@ -278,16 +275,3 @@
       return u2nc(u2k(sut), u2k(ref));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, crop)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, crop),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, crop), c3__crop,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_cull.c b/gen164/6/ut_cull.c
index dd9416871a..fe47d18bd2 100644
--- a/gen164/6/ut_cull.c
+++ b/gen164/6/ut_cull.c
@@ -8,7 +8,7 @@
 /* logic
 */
   u2_noun
-  j2_mcx(Pt6, ut, cull)(u2_noun, u2_noun, u2_bean, u2_atom, u2_noun);
+  _cqfu_cull(u2_noun, u2_noun, u2_bean, u2_atom, u2_noun);
 
   static u2_noun
   _cull_in(
@@ -28,7 +28,7 @@
 
       case c3__noun: {
         u2_noun pyr = u2_cqfu_repo(van, sut);
-        u2_noun yot = j2_mcx(Pt6, ut, cull)(van, pyr, pol, axe, ref);
+        u2_noun yot = _cqfu_cull(van, pyr, pol, axe, ref);
 
         if ( u2_yes == u2_cr_sing(pyr, yot) ) {
           ret = u2k(sut);
@@ -52,7 +52,7 @@
       }
       case c3__bull: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
       {
-        u2_noun hic = j2_mcx(Pt6, ut, cull)
+        u2_noun hic = _cqfu_cull
                                     (van, q_sut, pol, axe, ref);
 
         if ( u2_yes == u2_cr_sing(hic, q_sut) ) {
@@ -69,10 +69,10 @@
         u2_noun hub;
 
         if ( 2 == now ) {
-          hub = j2_mcx(Pt6, ut, cull)(van, p_sut, pol, lat, ref);
+          hub = _cqfu_cull(van, p_sut, pol, lat, ref);
           ret = u2_cqf_cell(hub, q_sut);
         } else {
-          hub = j2_mcx(Pt6, ut, cull)(van, q_sut, pol, lat, ref);
+          hub = _cqfu_cull(van, q_sut, pol, lat, ref);
           ret = u2_cqf_cell(p_sut, hub);
         }
         u2z(hub);
@@ -83,7 +83,7 @@
         if ( 3 != now ) {
           ret = u2k(sut);
         } else {
-          u2_noun hub = j2_mcx(Pt6, ut, cull)
+          u2_noun hub = _cqfu_cull
                                    (van, p_sut, pol, lat, ref);
 
           ret = u2_cqf_core(hub, q_sut);
@@ -94,7 +94,7 @@
       }
       case c3__face: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
       {
-        u2_noun hic = j2_mcx(Pt6, ut, cull)
+        u2_noun hic = _cqfu_cull
                                     (van, q_sut, pol, axe, ref);
 
         if ( u2_yes == u2_cr_sing(hic, q_sut) ) {
@@ -149,7 +149,7 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, cull)(
+  _cqfu_cull(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_bean pol,                              //  retain
@@ -172,11 +172,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, cull)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, cull)(u2_noun cor)                               //  retain
+  u2_cwfu_cull(u2_noun cor)                               //  retain
   {
     u2_noun sut, axe, pol, ref, van;
 
@@ -189,7 +186,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, cull)(van, sut, pol, axe, ref);
+      return _cqfu_cull(van, sut, pol, axe, ref);
     }
   }
 
@@ -207,7 +204,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, cull)(van, sut, pol, axe, ref);
+      pro = _cqfu_cull(van, sut, pol, axe, ref);
 
       return u2_cz_save_4(fun_m, sut, pol, axe, ref, pro);
     }
@@ -232,16 +229,3 @@
         (u2k(sut), pol, u2k(axe), u2k(ref));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, cull)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, cull),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, cull), c3__cull,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_find.c b/gen164/6/ut_find.c
index 263b43f021..da1fbe902e 100644
--- a/gen164/6/ut_find.c
+++ b/gen164/6/ut_find.c
@@ -669,7 +669,7 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, find)(
+  _cqfu_find(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun dep,                              //  retain
@@ -692,9 +692,6 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fino)[];
-
   u2_noun                                                         //  transfer
   j2_mc(Pt6, ut, fino)(
                        u2_noun cor)                               //  retain
@@ -757,26 +754,10 @@
     }
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fino)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, fino),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, fino), c3__fino,
-    },
-    { }
-  };
-
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, find)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, find)(
+  u2_cwfu_find(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, dep, way, cog, van;
@@ -790,7 +771,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, find)(van, sut, dep, way, cog);
+      return _cqfu_find(van, sut, dep, way, cog);
     }
   }
 
@@ -809,7 +790,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, find)(van, sut, dep, way, cog);
+      pro = _cqfu_find(van, sut, dep, way, cog);
 
       return u2_cz_save_4(fun_m, sut, dep, way, cog, pro);
     }
@@ -837,16 +818,3 @@
                 u2k(cog));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, find)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, find),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, find), c3__find,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_fink.c b/gen164/6/ut_fink.c
index 45ee3ed53e..7f69b3ae6e 100644
--- a/gen164/6/ut_fink.c
+++ b/gen164/6/ut_fink.c
@@ -8,7 +8,7 @@
 /* logic
 */
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, fink)(
+  _cqfu_fink(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun dep,                              //  retain
@@ -48,11 +48,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fink)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, fink)(u2_noun cor)                               //  retain
+  u2_cwfu_fink(u2_noun cor)                               //  retain
   {
     u2_noun sut, dep, way, cog, van;
 
@@ -65,7 +62,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, fink)(van, sut, dep, way, cog);
+      return _cqfu_fink(van, sut, dep, way, cog);
     }
   }
 
@@ -77,7 +74,7 @@
                         u2_noun way,                              //  retain
                         u2_noun cog)                              //  retain
   {
-    return j2_mcx(Pt6, ut, fink)(van, sut, dep, way, cog);
+    return _cqfu_fink(van, sut, dep, way, cog);
   }
 
   u2_weak
@@ -101,16 +98,3 @@
                 u2k(cog));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fink)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, fink),
-        Tier6_b,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, fink), c3__fink,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_fire.c b/gen164/6/ut_fire.c
index 4aee57185c..f67b12319e 100644
--- a/gen164/6/ut_fire.c
+++ b/gen164/6/ut_fire.c
@@ -13,7 +13,7 @@
              u2_noun dox,
              u2_noun gen)
   {
-    u2_noun rib = u2_cr_at(j2_ut_van_rib, van);
+    u2_noun rib = u2_cr_at(u2_cqfu_van_rib, van);
     u2_noun key = u2nt(u2k(sut),
                                u2k(dox),
                                u2k(gen));
@@ -25,7 +25,7 @@
     else {
       u2_noun rob = u2_cqdi_put(rib, key);
       u2_noun von = u2_ci_molt(u2k(van),
-                                      j2_ut_van_rib, u2k(rob),
+                                      u2_cqfu_van_rib, u2k(rob),
                                       0);
       ret = u2_cqfu_mull(von, sut, c3__noun, dox, gen);
 
@@ -122,12 +122,12 @@
     }
   }
   u2_noun                                                         //  produce
-  j2_mcx(Pt6, ut, fire)(
+  _cqfu_fire(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun hag)                              //  retain
   {
-    u2_bean vet = u2_cr_at(j2_ut_van_vet, van);
+    u2_bean vet = u2_cr_at(u2_cqfu_van_vet, van);
 
     {
       if ( (u2_yes == u2du(hag)) && (u2_nul == u2t(hag)) ) {
@@ -152,11 +152,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fire)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, fire)(
+  u2_cwfu_fire(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, hag, van;
@@ -166,7 +163,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, fire)(van, sut, hag);
+      return _cqfu_fire(van, sut, hag);
     }
   }
 
@@ -175,13 +172,5 @@
                         u2_noun sut,                              //  retain
                         u2_noun hag)                              //  retain
   {
-    return j2_mcx(Pt6, ut, fire)(van, sut, hag);
+    return _cqfu_fire(van, sut, hag);
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fire)[] = {
-    { ".2", c3__hevy, j2_mc(Pt6, ut, fire), Tier6_b, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/ut_firm.c b/gen164/6/ut_firm.c
index 936687f2af..b9363ac003 100644
--- a/gen164/6/ut_firm.c
+++ b/gen164/6/ut_firm.c
@@ -8,7 +8,7 @@
 /* logic
 */
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, firm)(
+  _cqfu_firm(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun dib)                              //  retain
@@ -41,8 +41,8 @@
         if ( u2_none == nun ) {
           return u2_no;
         } else {
-          return u2_and(j2_mcx(Pt6, ut, firm)(van, q_sut, dib),
-                        j2_mcx(Pt6, ut, firm)(van, u2t(u2t(u2t(p_sut))),
+          return u2_and(_cqfu_firm(van, q_sut, dib),
+                        _cqfu_firm(van, u2t(u2t(u2t(p_sut))),
                                                           nun));
         }
       }
@@ -50,8 +50,8 @@
       {
         return u2_and
           (u2du(dib),
-           u2_and(j2_mcx(Pt6, ut, firm)(van, p_sut, u2h(dib)),
-                  j2_mcx(Pt6, ut, firm)(van, q_sut, u2t(dib))));
+           u2_and(_cqfu_firm(van, p_sut, u2h(dib)),
+                  _cqfu_firm(van, q_sut, u2t(dib))));
       }
       case c3__core: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
       {
@@ -63,7 +63,7 @@
         return u2_and
           (u2du(dib),
            u2_and
-            (j2_mcx(Pt6, ut, firm)(van, p_sut, u2h(dib)),
+            (_cqfu_firm(van, p_sut, u2h(dib)),
              ((u2_nul == prq_sut) ? u2_cm_error("firm-core")
                                   : u2_cr_sing(prq_sut, u2t(dib)))));
       }
@@ -73,17 +73,17 @@
       }
       case c3__face: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
       {
-        return j2_mcx(Pt6, ut, firm)(van, q_sut, dib);
+        return _cqfu_firm(van, q_sut, dib);
       }
       case c3__fork: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
       {
-        return u2_or(j2_mcx(Pt6, ut, firm)(van, p_sut, dib),
-                     j2_mcx(Pt6, ut, firm)(van, q_sut, dib));
+        return u2_or(_cqfu_firm(van, p_sut, dib),
+                     _cqfu_firm(van, q_sut, dib));
       }
       case c3__hold:
       {
         u2_noun goy = u2_cqfu_repo(van, sut);
-        u2_noun ret = j2_mcx(Pt6, ut, firm)(van, goy, dib);
+        u2_noun ret = _cqfu_firm(van, goy, dib);
 
         u2z(goy);
         return ret;
@@ -93,11 +93,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, firm)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, firm)(
+  u2_cwfu_firm(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, dib, van;
@@ -107,7 +104,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, firm)(van, sut, dib);
+      return _cqfu_firm(van, sut, dib);
     }
   }
 
@@ -116,7 +113,7 @@
                         u2_noun sut,                              //  retain
                         u2_noun dib)                              //  retain
   {
-    return j2_mcx(Pt6, ut, firm)(van, sut, dib);
+    return _cqfu_firm(van, sut, dib);
   }
 
   u2_weak
@@ -132,16 +129,3 @@
       return u2nc(u2k(sut), u2k(dib));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, firm)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, firm),
-        Tier6_b,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, firm), c3__firm,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_fish.c b/gen164/6/ut_fish.c
index 8144b9c456..f04adb19b0 100644
--- a/gen164/6/ut_fish.c
+++ b/gen164/6/ut_fish.c
@@ -123,7 +123,7 @@
     }
   }
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, fish)(
+  _cqfu_fish(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_atom axe)                              //  retain
@@ -134,11 +134,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fish)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, fish)(
+  u2_cwfu_fish(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, axe, van;
@@ -149,7 +146,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, fish)(van, sut, axe);
+      return _cqfu_fish(van, sut, axe);
     }
   }
 
@@ -165,7 +162,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, fish)(van, sut, axe);
+      pro = _cqfu_fish(van, sut, axe);
 
       return u2_cz_save_2(fun_m, sut, axe, pro);
     }
@@ -185,16 +182,3 @@
       return u2nc(u2k(sut), u2k(axe));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fish)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, fish),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, fish), c3__fish,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_fuse.c b/gen164/6/ut_fuse.c
index c139ee0952..0ea6c9d50b 100644
--- a/gen164/6/ut_fuse.c
+++ b/gen164/6/ut_fuse.c
@@ -158,7 +158,7 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, fuse)(
+  _cqfu_fuse(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun ref)                              //  retain
@@ -168,11 +168,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fuse)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, fuse)(
+  u2_cwfu_fuse(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, ref, van;
@@ -182,7 +179,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, fuse)(van, sut, ref);
+      return _cqfu_fuse(van, sut, ref);
     }
   }
 
@@ -198,7 +195,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, fuse)(van, sut, ref);
+      pro = _cqfu_fuse(van, sut, ref);
 
       return u2_cz_save_2(fun_m, sut, ref, pro);
     }
@@ -217,16 +214,3 @@
       return u2nc(u2k(sut), u2k(ref));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, fuse)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, fuse),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, fuse), c3__fuse,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_heal.c b/gen164/6/ut_heal.c
index 854acbc17b..c1451c168a 100644
--- a/gen164/6/ut_heal.c
+++ b/gen164/6/ut_heal.c
@@ -202,7 +202,7 @@
 /* functions
 */
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, heal)(
+  _cqfu_heal(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun qog,                              //  retain
@@ -214,11 +214,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, heal)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, heal)(
+  u2_cwfu_heal(
                        u2_noun cor)                               //  retain
   {
     u2_noun van, sut, qog, axe, ref;
@@ -233,7 +230,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, heal)(van, sut, qog, axe, ref);
+      return _cqfu_heal(van, sut, qog, axe, ref);
     }
   }
 
@@ -244,7 +241,7 @@
                         u2_noun axe,                              //  retain
                         u2_noun ref)                              //  retain
   {
-    return j2_mcx(Pt6, ut, heal)(van, sut, qog, axe, ref);
+    return _cqfu_heal(van, sut, qog, axe, ref);
   }
 
   u2_weak
@@ -268,16 +265,3 @@
                 u2k(ref));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, heal)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, heal),
-        Tier6_b,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, heal), c3__heal,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_mint.c b/gen164/6/ut_mint.c
index 33e38ac011..4abd3db0e8 100644
--- a/gen164/6/ut_mint.c
+++ b/gen164/6/ut_mint.c
@@ -25,7 +25,7 @@ int FOO;
             u2_noun van)
   {
     // u2_bean vet = u2_cj_hook(u2k(van), "vet");
-    u2_bean vet = u2_cr_at(j2_ut_van_vet, van);
+    u2_bean vet = u2_cr_at(u2_cqfu_van_vet, van);
 
     switch ( vet ) {
       case u2_no:
@@ -212,7 +212,7 @@ int FOO;
       case u2_yes:
         von = u2k(van); break;
       case u2_no:
-        von = u2_ci_molt(u2k(van), j2_ut_van_vet, u2_no, 0); break;
+        von = u2_ci_molt(u2k(van), u2_cqfu_van_vet, u2_no, 0); break;
     }
     {
       u2_noun mil = u2_cqfu_mint(von, sut, c3__noun, gen);
@@ -826,7 +826,7 @@ int FOO;
       case c3__zpts: p_gen = u2t(gen);
       _mint_used();
       {
-        u2_noun von = u2_ci_molt(u2k(van), j2_ut_van_vet, u2_no, 0);
+        u2_noun von = u2_ci_molt(u2k(van), u2_cqfu_van_vet, u2_no, 0);
         u2_noun sev = _mint_corn(von, sut, p_gen);
 
         u2z(von);
@@ -918,7 +918,7 @@ int FOO;
   }
 
   u2_noun                                                         //  produce
-  j2_mcx(Pt6, ut, mint)(
+  _cqfu_mint(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun gol,
@@ -929,11 +929,8 @@ int FOO;
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, mint)[];
-
   u2_noun                                                         //  produce
-  j2_mc(Pt6, ut, mint)(u2_noun cor)                               //  retain
+  u2_cwfu_mint(u2_noun cor)                               //  retain
   {
     u2_noun sut, gol, gen, van;
 
@@ -945,7 +942,7 @@ int FOO;
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, mint)(van, sut, gol, gen);
+      return _cqfu_mint(van, sut, gol, gen);
     }
   }
 
@@ -956,14 +953,14 @@ int FOO;
                         u2_noun gen)                              //  retain
   {
     c3_m    fun_m = c3__mint;
-    u2_noun vrf   = u2_cr_at(j2_ut_van_vrf, van);
+    u2_noun vrf   = u2_cr_at(u2_cqfu_van_vrf, van);
     u2_noun pro   = u2_cz_find_4(fun_m, vrf, sut, gol, gen);
 
     if ( u2_none != pro ) {
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, mint)(van, sut, gol, gen);
+      pro = _cqfu_mint(van, sut, gol, gen);
 
       return u2_cz_save_4(fun_m, vrf, sut, gol, gen, pro);
     }
@@ -984,7 +981,7 @@ int FOO;
     {
       return u2_cm_bail(c3__fail);
     } else {
-      u2_noun vrf = u2_cr_at(j2_ut_van_vrf, van);
+      u2_noun vrf = u2_cr_at(u2_cqfu_van_vrf, van);
 
       return u2nq(u2k(vrf),
                           u2k(sut),
@@ -992,16 +989,3 @@ int FOO;
                           u2k(gen));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, mint)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, mint),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, mint), c3__mint,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_moot.c b/gen164/6/ut_moot.c
deleted file mode 100644
index e4b84720b3..0000000000
--- a/gen164/6/ut_moot.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/* j/6/ut_moot.c
-**
-** This file is in the public domain.
-*/
-#include "all.h"
-#include "../pit.h"
-
-/* logic
-*/
-  extern u2_ho_jet j2_mbj(Pt6, ut)[];
-  static u2_bean _moot_in(u2_noun, u2_noun, u2_noun);
-
-  static u2_bean
-  _moot_to(
-           u2_noun van,
-           u2_noun sut,
-           u2_noun gil)
-  {
-    u2_ho_jet *jet_j = &j2_mbj(Pt6, ut)[1];   // total hack
-
-    if ( !(jet_j->sat_s & u2_jet_memo) ) {
-      return _moot_in(van, sut, gil);
-    }
-    else {
-      c3_m    fun_m = c3__moot;
-      u2_noun pro   = u2_cz_find(fun_m, sut);
-
-      if ( u2_none != pro ) {
-        return pro;
-      }
-      else {
-        pro = _moot_in(van, sut, gil);
-
-        return u2_cz_save(fun_m, sut, pro);
-      }
-    }
-  }
-
-  static u2_bean
-  _moot_in(
-           u2_noun van,
-           u2_noun sut,
-           u2_noun gil)
-  {
-    u2_noun p_sut, q_sut;
-
-    if ( u2_no == u2du(sut) ) switch ( sut ) {
-      default: return u2_cm_bail(c3__fail);
-
-      case c3__noun: {
-        return u2_no;
-      }
-      case c3__void: {
-        return u2_yes;
-      }
-    } else switch ( u2h(sut) ) {
-      default: return u2_cm_bail(c3__fail);
-
-      case c3__atom: p_sut = u2t(sut);
-      {
-        return u2_no;
-      }
-      case c3__bull: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
-      {
-        return _moot_to(van, q_sut, gil);
-      }
-      case c3__cell: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
-      {
-        return u2_or(_moot_to(van, p_sut, gil),
-                     _moot_to(van, q_sut, gil));
-      }
-      case c3__core: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
-      {
-        return _moot_to(van, p_sut, gil);
-      }
-      case c3__cube: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
-      {
-        return u2_no;
-      }
-      case c3__face: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
-      {
-        return _moot_to(van, q_sut, gil);
-      }
-      case c3__fork: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
-      {
-        return u2_and(_moot_to(van, p_sut, gil),
-                      _moot_to(van, q_sut, gil));
-      }
-      case c3__hold: p_sut = u2t(sut);
-      {
-        if ( (u2_yes == u2_cqdi_has(gil, sut)) ) {
-          return u2_yes;
-        }
-        else {
-          u2_noun zoc = u2_cqdi_put(gil, sut);
-          u2_noun fop = u2_cqfu_rest(van, sut, p_sut);
-          u2_noun ret = _moot_to(van, fop, zoc);
-
-          u2z(fop);
-          u2z(zoc);
-
-          return ret;
-        }
-      }
-    }
-  }
-
-
-  extern u2_ho_jet
-  j2_mbj(Pt6, ut)[];
-
-  u2_noun                                                         //  transfer
-  j2_mcy(Pt6, ut, moot)(
-                        u2_noun van,                              //  retain
-                        u2_noun sut)                              //  retain
-  {
-    return _moot_to(van, sut, u2_nul);
-  }
-
-  u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, moot)(
-                       u2_noun cor)                               //  retain
-  {
-    u2_noun sut;
-
-    if ( u2_none == (sut = u2_cr_at(u2_cv_sam, cor)) ) {
-      return u2_cm_bail(c3__fail);
-    } else {
-      return j2_mcy(Pt6, ut, moot)(cor, sut);
-    }
-  }
-
-  u2_weak
-  j2_mck(Pt6, ut, moot)(
-                        u2_noun cor)
-  {
-    u2_noun sut;
-
-    if ( (u2_none == (sut = u2_cr_at(u2_cv_sam, cor))) ) {
-      return u2_none;
-    } else {
-      return u2k(sut);
-    }
-  }
-
diff --git a/gen164/6/ut_mull.c b/gen164/6/ut_mull.c
index fd923eddce..5bdbee33dc 100644
--- a/gen164/6/ut_mull.c
+++ b/gen164/6/ut_mull.c
@@ -15,7 +15,7 @@
             u2_noun van)
   {
     // u2_bean vet = u2_cj_hook(u2k(van), "vet");
-    u2_bean vet = u2_cr_at(j2_ut_van_vet, van);
+    u2_bean vet = u2_cr_at(u2_cqfu_van_vet, van);
 
     switch ( vet ) {
       case u2_no:
@@ -670,7 +670,7 @@
           u2_noun yom = _mull_edit
             (van, sut, dox, mew, u2k(qq_lar),
                                         u2k(qq_vug));
-          u2_noun von = u2_ci_molt(u2k(van), j2_ut_van_vet, u2_no, 0);
+          u2_noun von = u2_ci_molt(u2k(van), u2_cqfu_van_vet, u2_no, 0);
           u2_noun p_ret = u2_cqfu_fire(van, sut, u2h(yom));
           u2_noun q_ret = u2_cqfu_fire(von, sut, u2t(yom));
 
@@ -811,7 +811,7 @@
   }
 
   u2_bean                                                         //  transfer
-  j2_mcx(Pt6, ut, mull)(
+  _cqfu_mull(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun gol,                              //  retain
@@ -830,11 +830,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, mull)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, mull)(
+  u2_cwfu_mull(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, gol, dox, gen, van;
@@ -848,7 +845,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, mull)(van, sut, gol, dox, gen);
+      return _cqfu_mull(van, sut, gol, dox, gen);
     }
   }
 
@@ -866,7 +863,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, mull)(van, sut, gol, dox, gen);
+      pro = _cqfu_mull(van, sut, gol, dox, gen);
 
       return u2_cz_save_4(fun_m, sut, gol, dox, gen, pro);
     }
@@ -891,14 +888,3 @@
       return u2nq(u2k(sut), u2k(gol), u2k(dox), u2k(gen));
     }
   }
-
-  u2_ho_jet
-  j2_mcj(Pt6, ut, mull)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, mull),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, mull), c3__mull,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_nest.c b/gen164/6/ut_nest.c
index 976b49f674..b55ecfcbc9 100644
--- a/gen164/6/ut_nest.c
+++ b/gen164/6/ut_nest.c
@@ -14,9 +14,6 @@
     static u2_bean
     _nest_dext(u2_noun, u2_noun, u2_bean, u2_noun, u2_noun);
 
-    u2_ho_jet
-    j2_mcj(Pt6, ut, nest)[];
-
   static u2_bean
   _nest_cram(
              u2_noun van,
@@ -347,22 +344,16 @@
     }
 
     {
-      u2_ho_jet *jet_j = &j2_mcj(Pt6, ut, nest)[0];
+      c3_m    fun_m = c3__nest;
+      u2_noun pro   = u2_cz_find_2(fun_m, sut, ref);
 
-      if ( !(jet_j->sat_s & u2_jet_memo) ) {
-        return _nest_dext_to(van, sut, tel, ref, gil);
-      } else {
-        c3_m    fun_m = c3__nest;
-        u2_noun pro   = u2_cz_find_2(fun_m, sut, ref);
+      if ( u2_none != pro ) {
+        return pro;
+      }
+      else {
+        pro = _nest_dext_to(van, sut, tel, ref, gil);
 
-        if ( u2_none != pro ) {
-          return pro;
-        }
-        else {
-          pro = _nest_dext_to(van, sut, tel, ref, gil);
-
-          return u2_cz_save_2(fun_m, sut, ref, pro);
-        }
+        return u2_cz_save_2(fun_m, sut, ref, pro);
       }
     }
   }
@@ -458,7 +449,7 @@
   }
 
   u2_bean                                                         //  transfer
-  j2_mcx(Pt6, ut, nest)(
+  _cqfu_nest(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_bean tel,                              //  retain
@@ -470,7 +461,7 @@
 /* boilerplate
 */
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, nest)(u2_noun cor)                               //  retain
+  u2_cwfu_nest(u2_noun cor)                               //  retain
   {
     u2_noun sut, tel, ref, van;
 
@@ -483,7 +474,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, nest)(van, sut, tel, ref);
+      return _cqfu_nest(van, sut, tel, ref);
     }
   }
 
@@ -493,7 +484,7 @@
                         u2_bean tel,                              //  retain
                         u2_noun ref)                              //  retain
   {
-    return j2_mcx(Pt6, ut, nest)(van, sut, tel, ref);
+    return _cqfu_nest(van, sut, tel, ref);
   }
 
   u2_weak
@@ -509,16 +500,3 @@
       return u2nc(u2k(sut), u2k(ref));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, nest)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, nest),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, nest), c3__nest,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_park.c b/gen164/6/ut_park.c
index 1b799bdafb..5a094b9110 100644
--- a/gen164/6/ut_park.c
+++ b/gen164/6/ut_park.c
@@ -8,7 +8,7 @@
 /* logic
 */
   u2_bean                                                         //  transfer
-  j2_mcx(Pt6, ut, park)(
+  _cqfu_park(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun way,                              //  retain
@@ -18,7 +18,7 @@
       return u2_cm_bail(c3__fail);
     }
     // else if ( u2_no == u2_cj_hook(u2k(van), "vet") ) {
-    else if ( u2_no == u2_cr_at(j2_ut_van_vet, van) ) {
+    else if ( u2_no == u2_cr_at(u2_cqfu_van_vet, van) ) {
       return u2_yes;
     }
     else {
@@ -63,11 +63,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, park)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, park)(
+  u2_cwfu_park(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, way, axe, van;
@@ -81,7 +78,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, park)(van, sut, way, axe);
+      return _cqfu_park(van, sut, way, axe);
     }
   }
 
@@ -91,13 +88,6 @@
                         u2_noun way,                              //  retain
                         u2_noun axe)                              //  retain
   {
-    return j2_mcx(Pt6, ut, park)(van, sut, way, axe);
+    return _cqfu_park(van, sut, way, axe);
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, park)[] = {
-    { ".2", c3__hevy, j2_mc(Pt6, ut, park), Tier6_b, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/ut_peek.c b/gen164/6/ut_peek.c
index c16d7a03e0..90301d1396 100644
--- a/gen164/6/ut_peek.c
+++ b/gen164/6/ut_peek.c
@@ -8,7 +8,7 @@
 /* logic
 */
   u2_noun
-  j2_mcx(Pt6, ut, peek)(u2_noun, u2_noun, u2_noun, u2_atom);
+  _cqfu_peek(u2_noun, u2_noun, u2_noun, u2_atom);
 
   static u2_noun                                                  //  produce
   _peek_in(
@@ -52,10 +52,10 @@
           u2_atom tap = u2_cqc_mas(axe);
 
           if ( 2 == tip ) {
-            pro = j2_mcx(Pt6, ut, peek)(van, p_sut, way, tap);
+            pro = _cqfu_peek(van, p_sut, way, tap);
           }
           else {
-            pro = j2_mcx(Pt6, ut, peek)(van, q_sut, way, tap);
+            pro = _cqfu_peek(van, q_sut, way, tap);
           }
           u2z(tap);
           u2z(tip);
@@ -88,7 +88,7 @@
 
               return u2_cm_error("peek-park");
             }
-            else pro = j2_mcx(Pt6, ut, peek)(van, p_sut, way, tap);
+            else pro = _cqfu_peek(van, p_sut, way, tap);
           }
           else {
             pro = c3__noun;
@@ -148,7 +148,7 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, peek)(
+  _cqfu_peek(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun way,
@@ -162,11 +162,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, peek)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, peek)(
+  u2_cwfu_peek(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, way, axe, van;
@@ -180,7 +177,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, peek)(van, sut, way, axe);
+      return _cqfu_peek(van, sut, way, axe);
     }
   }
 
@@ -197,7 +194,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, peek)(van, sut, way, axe);
+      pro = _cqfu_peek(van, sut, way, axe);
 
       return u2_cz_save_3(fun_m, sut, way, axe, pro);
     }
@@ -220,16 +217,3 @@
         (u2k(sut), u2k(way), u2k(axe));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, peek)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, peek),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, peek), c3__peek
-    },
-    { }
-  };
diff --git a/gen164/6/ut_play.c b/gen164/6/ut_play.c
index 3163a32e8b..d55b46977a 100644
--- a/gen164/6/ut_play.c
+++ b/gen164/6/ut_play.c
@@ -503,12 +503,12 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, play)(
+  _cqfu_play(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun gen)                              //  retain
   {
-    u2_noun von = u2_ci_molt(u2k(van), j2_ut_van_vet, u2_no, 0);
+    u2_noun von = u2_ci_molt(u2k(van), u2_cqfu_van_vet, u2_no, 0);
     u2_noun ret = _play_x(von, sut, gen);
 
     u2z(von);
@@ -517,11 +517,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, play)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, play)(
+  u2_cwfu_play(
                          u2_noun cor)                             //  retain
   {
     u2_noun sut, gen, van;
@@ -531,7 +528,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, play)(van, sut, gen);
+      return _cqfu_play(van, sut, gen);
     }
   }
 
@@ -540,13 +537,5 @@
                         u2_noun sut,                              //  retain
                         u2_noun gen)                              //  retain
   {
-    return j2_mcx(Pt6, ut, play)(van, sut, gen);
+    return _cqfu_play(van, sut, gen);
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, play)[] = {
-    { ".2", c3__hevy, j2_mc(Pt6, ut, play), Tier6_b, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/ut_repo.c b/gen164/6/ut_repo.c
index c2cd9bff25..c413d3c526 100644
--- a/gen164/6/ut_repo.c
+++ b/gen164/6/ut_repo.c
@@ -63,7 +63,7 @@
   }
 
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, repo)(
+  u2_cwfu_repo(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut;
diff --git a/gen164/6/ut_rest.c b/gen164/6/ut_rest.c
index d585c5c7ec..93a125553d 100644
--- a/gen164/6/ut_rest.c
+++ b/gen164/6/ut_rest.c
@@ -83,19 +83,19 @@
   }
 
   u2_noun                                                         //  produce
-  j2_mcx(Pt6, ut, rest)(
+  _cqfu_rest(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun leg)                              //  retain
   {
-    u2_noun fan = u2_cr_at(j2_ut_van_fan, van);
+    u2_noun fan = u2_cr_at(u2_cqfu_van_fan, van);
 
     if ( u2_yes == _rest_hit_fan(fan, leg) ) {
       return u2_cm_error("rest-loop");
     }
     else {
       u2_noun naf = u2_cqdi_gas(fan, leg);
-      u2_noun nav = u2_ci_molt(u2k(van), j2_ut_van_fan, naf, 0);
+      u2_noun nav = u2_ci_molt(u2k(van), u2_cqfu_van_fan, naf, 0);
       u2_noun mez = _rest_in(nav, leg);
 
       u2z(naf);
@@ -106,11 +106,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, rest)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, rest)(
+  u2_cwfu_rest(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, leg, van;
@@ -120,7 +117,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, rest)(van, sut, leg);
+      return _cqfu_rest(van, sut, leg);
     }
   }
 
@@ -136,7 +133,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, rest)(van, sut, leg);
+      pro = _cqfu_rest(van, sut, leg);
 
       return u2_cz_save_2(fun_m, sut, leg, pro);
     }
@@ -155,16 +152,3 @@
       return u2nc(u2k(sut), u2k(leg));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, rest)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, rest),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, rest), c3__rest,
-    },
-    { }
-  };
diff --git a/gen164/6/ut_seek.c b/gen164/6/ut_seek.c
index 1eb4dccf2c..ed025fa46b 100644
--- a/gen164/6/ut_seek.c
+++ b/gen164/6/ut_seek.c
@@ -123,7 +123,7 @@
 #endif
 
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, seek)(
+  _cqfu_seek(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun way,                              //  retain
@@ -149,7 +149,7 @@
         yip = u2nt(u2_no, 0, u2k(i_hyp));
       }
 
-      zar = j2_mcx(Pt6, ut, seek)(van, sut, way, t_hyp);
+      zar = _cqfu_seek(van, sut, way, t_hyp);
       u2_cr_cell(zar, &p_zar, &q_zar);
 
 #if 0
@@ -219,11 +219,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, seek)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, seek)(
+  u2_cwfu_seek(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, way, hyp, van;
@@ -236,7 +233,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, seek)(van, sut, way, hyp);
+      return _cqfu_seek(van, sut, way, hyp);
     }
   }
 
@@ -253,7 +250,7 @@
       return pro;
     }
     else {
-      pro = j2_mcx(Pt6, ut, seek)(van, sut, way, hyp);
+      pro = _cqfu_seek(van, sut, way, hyp);
 
       return u2_cz_save_3(fun_m, sut, way, hyp, pro);
     }
@@ -299,17 +296,3 @@
         (u2k(sut), u2k(way), u2k(hyp));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, seek)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, seek),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, seek), c3__seek
-    },
-    { }
-  };
-
diff --git a/gen164/6/ut_sift.c b/gen164/6/ut_sift.c
index 329ac749cf..c11efc8592 100644
--- a/gen164/6/ut_sift.c
+++ b/gen164/6/ut_sift.c
@@ -7,11 +7,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, sift)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, sift)(
+  u2_cwfu_sift(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, ref, van;
@@ -52,17 +49,3 @@
         (u2k(sut), u2k(ref));
     }
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, sift)[] = {
-    { ".2", c3__hevy,
-        j2_mc(Pt6, ut, sift),
-        Tier6_b_memo,
-        u2_none, u2_none,
-        j2_mck(Pt6, ut, sift), c3__sift
-    },
-    { }
-  };
-
diff --git a/gen164/6/ut_swab.c b/gen164/6/ut_swab.c
index 36f3dd7110..abd3ac642a 100644
--- a/gen164/6/ut_swab.c
+++ b/gen164/6/ut_swab.c
@@ -11,7 +11,7 @@
 /* functions
 */
   u2_noun                                                         //  produce
-  j2_mcx(Pt6, ut, snub)(u2_noun van,                              //  retain
+  _cqfu_snub(u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun har)                              //  retain
   {
@@ -24,7 +24,7 @@
       u2_noun qi_har = u2t(i_har);
       u2_noun peh = u2_cqb_flop(pi_har);
       u2_noun ret = u2nc(u2nc(peh, u2k(qi_har)),
-                                 j2_mcx(Pt6, ut, snub)
+                                 _cqfu_snub
                                     (van, sut, t_har));
 
       return ret;
@@ -33,11 +33,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, snub)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, snub)(
+  u2_cwfu_snub(
                        u2_noun cor)                               //  retain
   {
     u2_noun van, sut, har;
@@ -49,7 +46,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, snub)(van, sut, har);
+      return _cqfu_snub(van, sut, har);
     }
   }
 
@@ -58,13 +55,6 @@
                         u2_noun sut,                              //  retain
                         u2_noun har)                              //  retain
   {
-    return j2_mcx(Pt6, ut, snub)(van, sut, har);
+    return _cqfu_snub(van, sut, har);
   }
 
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, snub)[] = {
-    { ".2", c3__hevy, j2_mc(Pt6, ut, snub), Tier6_c, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/ut_tock.c b/gen164/6/ut_tock.c
index 04ce9b844f..2fd6fc1e68 100644
--- a/gen164/6/ut_tock.c
+++ b/gen164/6/ut_tock.c
@@ -50,7 +50,7 @@
 /* functions
 */
   u2_noun                                                         //  transfer
-  j2_mcx(Pt6, ut, tock)(
+  _cqfu_tock(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun peh,                              //  retain
@@ -74,11 +74,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, tock)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, tock)(
+  u2_cwfu_tock(
                        u2_noun cor)                               //  retain
   {
     u2_noun van, sut, peh, mur, men;
@@ -92,7 +89,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, tock)(van, sut, peh, mur, men);
+      return _cqfu_tock(van, sut, peh, mur, men);
     }
   }
 
@@ -103,13 +100,5 @@
                         u2_noun mur,                              //  retain
                         u2_noun men)                              //  retain
   {
-    return j2_mcx(Pt6, ut, tock)(van, sut, peh, mur, men);
+    return _cqfu_tock(van, sut, peh, mur, men);
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, tock)[] = {
-    { ".2", c3__hevy, j2_mc(Pt6, ut, tock), Tier6_c, u2_none, u2_none },
-    { }
-  };
diff --git a/gen164/6/ut_wrap.c b/gen164/6/ut_wrap.c
index 2aa782129e..35508df6bf 100644
--- a/gen164/6/ut_wrap.c
+++ b/gen164/6/ut_wrap.c
@@ -6,7 +6,7 @@
 #include "../pit.h"
 
   static u2_noun                                                  //  produce
-  j2_mcx(Pt6, ut, wrap)(
+  _cqfu_wrap(
                         u2_noun van,                              //  retain
                         u2_noun sut,                              //  retain
                         u2_noun yoz)                              //  retain
@@ -40,13 +40,13 @@
       case c3__fork: u2_cx_cell(u2t(sut), &p_sut, &q_sut);
       {
         return u2_cqf_fork
-          (j2_mcx(Pt6, ut, wrap)(van, p_sut, yoz),
-                  j2_mcx(Pt6, ut, wrap)(van, q_sut, yoz));
+          (_cqfu_wrap(van, p_sut, yoz),
+                  _cqfu_wrap(van, q_sut, yoz));
       }
       case c3__hold:
       {
         u2_noun fop = u2_cqfu_repo(van, sut);
-        u2_noun pro = j2_mcx(Pt6, ut, wrap)(van, fop, yoz);
+        u2_noun pro = _cqfu_wrap(van, fop, yoz);
 
         u2z(fop);
         return pro;
@@ -56,11 +56,8 @@
 
 /* boilerplate
 */
-  u2_ho_jet
-  j2_mcj(Pt6, ut, wrap)[];
-
   u2_noun                                                         //  transfer
-  j2_mc(Pt6, ut, wrap)(
+  u2_cwfu_wrap(
                        u2_noun cor)                               //  retain
   {
     u2_noun sut, yoz, van;
@@ -70,7 +67,7 @@
     {
       return u2_cm_bail(c3__fail);
     } else {
-      return j2_mcx(Pt6, ut, wrap)(van, sut, yoz);
+      return _cqfu_wrap(van, sut, yoz);
     }
   }
 
@@ -79,13 +76,5 @@
                         u2_noun sut,                              //  retain
                         u2_noun yoz)                              //  retain
   {
-    return j2_mcx(Pt6, ut, wrap)(van, sut, yoz);
+    return _cqfu_wrap(van, sut, yoz);
   }
-
-/* structures
-*/
-  u2_ho_jet
-  j2_mcj(Pt6, ut, wrap)[] = {
-    { ".2", c3__hevy, j2_mc(Pt6, ut, wrap), Tier6_b, u2_none, u2_none },
-    { }
-  };
diff --git a/include/f/meme.h b/include/f/meme.h
index 2ad9d3090f..6cdc2f9ed7 100644
--- a/include/f/meme.h
+++ b/include/f/meme.h
@@ -9,14 +9,15 @@
   ***  u2_ch_: HAMT hash tables.
   ***  u2_ci_: noun constructors
   ***  u2_cj_: jets.
-  ***  u2_ck*: direct jet calls (modern convention)
+  ***  u2_ck*: direct jet calls (modern C convention)
   ***  u2_cm_: system management etc.
   ***  u2_cn_: nock interpreter.
   ***  u2_co_: fundamental macros.
-  ***  u2_cq*: direct jet calls (archaic convention)
+  ***  u2_cq*: direct jet calls (archaic C convention)
   ***  u2_cr_: read functions which never bail out.
   ***  u2_cs_: structures and definitions.
   ***  u2_ct_: tracing.
+  ***  u2_cw_: direct jet calls (core noun convention)
   ***  u2_cx_: read functions which do bail out.
   ***  u2_cz_: memoization.
   ***
diff --git a/include/f/qjet.h b/include/f/qjet.h
index 3fc962ed8d..40fc68b8ac 100644
--- a/include/f/qjet.h
+++ b/include/f/qjet.h
@@ -84,12 +84,6 @@
 
     /** Tier 6.
     **/
-#     define j2_ut_van_fan  28
-#     define j2_ut_van_rib  58
-#     define j2_ut_van_vrf  59
-#     define j2_ut_van_vet  118
-#     define j2_ut_van_fab  119
-
       u2_noun u2_cqf_bull(u2_noun, u2_noun);
       u2_noun u2_cqf_cell(u2_noun, u2_noun);
       u2_noun u2_cqf_comb(u2_noun, u2_noun);
@@ -116,6 +110,12 @@
       u2_noun u2_cqfp_open(u2_noun, u2_noun);
       u2_noun u2_cqfp_rake(u2_noun);
 
+#     define u2_cqfu_van_fan  28
+#     define u2_cqfu_van_rib  58
+#     define u2_cqfu_van_vrf  59
+#     define u2_cqfu_van_vet  118
+#     define u2_cqfu_van_fab  119
+
       u2_noun u2_cqfu_burn(u2_noun, u2_noun);
       u2_noun u2_cqfu_busk(u2_noun, u2_noun, u2_noun, u2_noun);
       u2_noun u2_cqfu_bust(u2_noun, u2_noun, u2_noun);