--- gforth/prim	2004/03/29 11:23:01	1.151
+++ gforth/prim	2004/04/10 10:09:52	1.153
@@ -324,7 +324,10 @@ INST_TAIL;
 JUMP(a_target);
 #else
 SET_IP((Xt *)a_target);
+INST_TAIL;
+NEXT_P2;
 #endif
+SUPER_CONTINUE;  /* we do our own control flow, so don't append NEXT etc. */
 :
  r> @ >r ;
 
@@ -2414,10 +2417,10 @@ SAVE_REGS
 av_call(alist);
 REST_REGS
 #ifdef BUGGY_LONG_LONG
-d = llrv;
-#else
 d.lo = llrv;
 d.hi = 0;
+#else
+d = llrv;
 #endif
 
 av-call-ptr	( -- c_addr )	gforth  av_call_ptr