--- a/mc-inline.c	Sat Oct 27 13:30:38 2007 +0900
+++ b/mc-inline.c	Sat Oct 27 23:20:44 2007 +0900
@@ -899,14 +899,14 @@
 p_decl(int e)
 {
     // list4(ST_DECL,parse,(int)n,list3(mode,stmode,ctmode),init);
-    int ctmode=cadddr(e);
-    NMTBL *n=(NMTBL*)caddr(e);
+    int ctmode=caddr(e);
+    NMTBL *n=ncaddddr(e);
     int dsp = n->dsp;
     int v=0;
     int sstmode = stmode;
     int smode = mode;
     int save_init_vars = init_vars;
-    int init = caddddr(e); // variable initialization
+    int init = cadddr(e); // variable initialization
 
     init_vars = 0;
     // in real partial evaluation, we have to check whether this variable
@@ -963,7 +963,7 @@
     if (n->sc!=FLABEL)
 	inline_lvars = glist2(v,inline_lvars);
     if (heap[pdisp+dsp]) {
-	fprintf(stderr,"## double p_decl %s %s\n",((NMTBL*)(caddr(heap[pdisp+dsp])))->nm,n->nm);
+	fprintf(stderr,"## double p_decl %s %s\n",(ncaddr(heap[pdisp+dsp]))->nm,n->nm);
 	error(-1);
     }
     heap[pdisp+dsp]=v;
@@ -1545,7 +1545,7 @@
     }
 
     for (e3 = e5 = reverse0(caddr(e)); e3; e3 = cadr(e3)) {
-	anptr = (NMTBL*)caddr(fargtype);
+	anptr = ncadddr(fargtype);
 	if (!anptr) break; // should not happen?
         t=caddr(e3);  // type
 	e4 = car(e3);
@@ -1575,7 +1575,7 @@
 leave_inline(int e1,int toplevel)
 {
     NMTBL *n;
-    NMTBL *local_statics = (NMTBL*)cadddr(e1);  // local static list
+    NMTBL *local_statics = ncadddr(e1);  // local static list
 
     if (retcont && !toplevel) error(STERR); 
     // inline can't handle return/environment except top level