Index: generic/nsfStack.c
===================================================================
diff -u -rbedb248602f8940383c0f4a10bb4f99b3a5f2c4f -rafe1427fb16c3833bbbf45bb8496e059a6519d09
--- generic/nsfStack.c	(.../nsfStack.c)	(revision bedb248602f8940383c0f4a10bb4f99b3a5f2c4f)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision afe1427fb16c3833bbbf45bb8496e059a6519d09)
@@ -31,7 +31,7 @@
       fprintf(stderr, " csc %p frameType %.4x callType %.4x (%p %s)\n",
 	      cscPtr,
               cscPtr ? cscPtr->frameType : -1,
-              cscPtr ? cscPtr->callType : -1,
+              cscPtr ? cscPtr->flags : -1,
               cscPtr ? cscPtr->self : NULL, 
               cscPtr ? objectName(cscPtr->self) : "");
     } else {
@@ -195,7 +195,7 @@
   for (; varFramePtr; varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) {
     if (Tcl_CallFrame_isProcCallFrame(varFramePtr) & FRAME_IS_NSF_METHOD) {
       NsfCallStackContent *cscPtr = (NsfCallStackContent *)Tcl_CallFrame_clientData(varFramePtr);
-      if ((cscPtr->callType & NSF_CSC_CALL_IS_NEXT) || (cscPtr->frameType & NSF_CSC_TYPE_INACTIVE)) {
+      if ((cscPtr->flags & NSF_CSC_CALL_IS_NEXT) || (cscPtr->frameType & NSF_CSC_TYPE_INACTIVE)) {
         continue;
       }
       if (offset) {
@@ -316,7 +316,7 @@
     /*
      * The test for CALL_IS_ENSEMBLE is just a saftey belt
      */ 
-    if ((cscPtr->callType & NSF_CSC_CALL_IS_ENSEMBLE) == 0) break;
+    if ((cscPtr->flags & NSF_CSC_CALL_IS_ENSEMBLE) == 0) break;
   }
   if (framePtrPtr) {
     *framePtrPtr = varFramePtr;
@@ -418,7 +418,7 @@
 
 #if defined(NRE)
       /* Mask out IS_NRE, since Tcl_PopCallFrame takes care about TclStackFree */
-      cscPtr->callType &= ~NSF_CSC_CALL_IS_NRE;
+      cscPtr->flags &= ~NSF_CSC_CALL_IS_NRE;
 #endif
       CscFinish(interp, cscPtr, "popall");
     } else if (frameFlags & FRAME_IS_NSF_OBJECT) {
@@ -453,12 +453,12 @@
 
   if (proc == TclObjInterpProc) {
     cscPtr = (NsfCallStackContent *) NsfTclStackAlloc(interp, sizeof(NsfCallStackContent), "csc");
-    cscPtr->callType = NSF_CSC_CALL_IS_NRE;
+    cscPtr->flags = NSF_CSC_CALL_IS_NRE;
   } else {
-    cscPtr->callType = 0;
+    cscPtr->flags = 0;
   }
 #else
-  cscPtr->callType = 0;
+  cscPtr->flags = 0;
 #endif
 
   /*fprintf(stderr, "CscAlloc allocated %p\n",cscPtr);*/
@@ -497,7 +497,7 @@
      *  CscAlloc()
      */
 
-    cscPtr->callType |= NSF_CSC_OBJECT_ACTIVATED;
+    cscPtr->flags |= NSF_CSC_OBJECT_ACTIVATED;
 
     // TODO
     /*
@@ -533,7 +533,7 @@
     }
     
   }
-  cscPtr->callType     |= flags & NSF_CSC_COPY_FLAGS;
+  cscPtr->flags     |= flags & NSF_CSC_COPY_FLAGS;
   cscPtr->self          = object;
   cscPtr->cl            = cl;
   cscPtr->cmdPtr        = cmd;
@@ -550,7 +550,7 @@
           );
 #endif
   /*fprintf(stderr, "CscInit %p (%s) object %p %s flags %.6x cmdPtr %p\n",cscPtr, msg,
-    object, objectName(object), cscPtr->callType, cscPtr->cmdPtr);*/
+    object, objectName(object), cscPtr->flags, cscPtr->cmdPtr);*/
 }
 
 /*
@@ -579,7 +579,7 @@
   assert(cscPtr->self);
 
   object = cscPtr->self;
-  flags = cscPtr->callType;
+  flags = cscPtr->flags;
 
   /*fprintf(stderr, "CscFinish %p (%s) object %p %s flags %.6x cmdPtr %p\n",cscPtr, msg, 
     object, objectName(object), flags, cscPtr->cmdPtr);*/
@@ -658,7 +658,7 @@
   }
 
 #if defined(NRE)
-  if ((cscPtr->callType & NSF_CSC_CALL_IS_NRE)) {
+  if ((cscPtr->flags & NSF_CSC_CALL_IS_NRE)) {
     NsfTclStackFree(interp, cscPtr, msg);
   }
 #endif