From 23a0228e7f832133ec9d89621a9107586818a4bc Mon Sep 17 00:00:00 2001
From: "C. Guy Yarvin" <cgyarvin@gmail.com>
Date: Tue, 18 Nov 2014 10:56:28 -0800
Subject: [PATCH] More calx adjustments.

---
 i/n/j.h |  2 +-
 n/j.c   | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/i/n/j.h b/i/n/j.h
index c1488262b..7794f240b 100644
--- a/i/n/j.h
+++ b/i/n/j.h
@@ -11,8 +11,8 @@
   ++  batt  ,*                                            ::  battery
   ++  calf                                                ::  
     $:  jax=,@ud                                          ::  hot core index
-        pax=,@ud                                          ::  parent axis or 0
         hap=(map ,@ud ,@ud)                               ::  axis/hot arm index
+        ext=*                                             ::  arbitrary data
     ==                                                    ::
   ++  calx  (trel calf cope club)                         ::  cached by battery
   ++  clog  (pair cope (map batt club))                   ::  identity record
diff --git a/n/j.c b/n/j.c
index 6d3416a8a..28118b47b 100644
--- a/n/j.c
+++ b/n/j.c
@@ -432,7 +432,7 @@ _cj_warm_ream_be(c3_l    jax_l,
 {
   u3h_put(u3R->jed.har_p,
             bat,
-            u3nt(u3nt(jax_l, u3k(pax), _cj_warm_hump(jax_l, u3t(cub))),
+            u3nt(u3nt(jax_l, _cj_warm_hump(jax_l, u3t(cub)), u3_nul),
                  u3k(mop),
                  u3k(cub)));
 }
@@ -564,7 +564,7 @@ _cj_warm_mine(u3_noun clu, u3_noun cor)
 
     if ( u3_none != cey ) {
       u3_noun huc = u3t(u3t(cey));
-      u3_noun pax = u3h(u3t(cey));
+      // u3_noun pax = u3h(u3t(cey));
       u3_noun mop;
 
       if ( u3_none != (mop = _cj_cold_mine(cey, cor)) ) {
@@ -573,7 +573,7 @@ _cj_warm_mine(u3_noun clu, u3_noun cor)
         // fprintf(stderr, "warm: bat %x\r\n", u3r_mug(bat));
         u3h_put(u3R->jed.har_p, 
                   bat, 
-                  u3nt(u3nt(jax_l, u3k(pax), _cj_warm_hump(jax_l, huc)),
+                  u3nt(u3nt(jax_l, _cj_warm_hump(jax_l, huc), u3_nul),
                        mop,
                        u3nc(u3_nul, u3k(huc))));
       }
@@ -725,14 +725,13 @@ _cj_hook_in(u3_noun     cor,
     if ( u3_none == cax ) { return u3m_bail(c3__fail); }
     {
       u3_noun p_cax, q_cax, r_cax;
-      u3_noun jax, pax, mop, huc, hap;
+      u3_noun jax, mop, huc, hap, ext;
       u3_noun p_mop, q_mop, r_mop;
 
       u3x_trel(cax, &p_cax, &q_cax, &r_cax);
-      u3x_trel(p_cax, &jax, &pax, &hap);
+      u3x_trel(p_cax, &jax, &hap, &ext);
       mop = q_cax;
       u3x_trel(mop, &p_mop, &q_mop, &r_mop);
-      c3_assert(pax == q_mop);
 
       huc = u3t(r_cax);
       {
@@ -824,7 +823,7 @@ u3j_kick(u3_noun cor, u3_noun axe)
 
     if ( u3_none == cax ) { return u3_none; }
     {
-      u3_noun hap = u3t(u3t(u3h(cax)));
+      u3_noun hap = u3h(u3t(u3h(cax)));
       u3_noun inx = u3kdb_get(u3k(hap), u3k(axe));
 
       if ( u3_none == inx ) {