Index: generic/nsfStack.c
===================================================================
diff -u -r937992852d688bc487c8f59273dfa045d077a9c8 -rd884e8166428ad9dae6c39cb16c8324953b69b11
--- generic/nsfStack.c	(.../nsfStack.c)	(revision 937992852d688bc487c8f59273dfa045d077a9c8)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision d884e8166428ad9dae6c39cb16c8324953b69b11)
@@ -748,7 +748,7 @@
       /* Mask out IS_NRE, since Tcl_PopCallFrame takes care about TclStackFree */
       cscPtr->flags &= ~NSF_CSC_CALL_IS_NRE;
 #endif
-      CscFinish(interp, cscPtr, "popall");
+      CscFinish(interp, cscPtr /*, "popall"*/);
     } else if (frameFlags & FRAME_IS_NSF_OBJECT) {
       Tcl_CallFrame_varTablePtr(framePtr) = NULL;
     }
@@ -766,7 +766,7 @@
 	 unstackedEntries = unstackedEntries->nextPtr, count ++) {
       NsfCallStackContent *cscPtr = (NsfCallStackContent *)unstackedEntries->cl;
       CscListRemove(interp, cscPtr);
-      CscFinish(interp, cscPtr, "unwind");
+      CscFinish(interp, cscPtr /*, "unwind"*/);
     }
     
     fprintf(stderr, "+++ unwind removed %d unstacked csc entries\n", count);
@@ -827,7 +827,7 @@
  */
 NSF_INLINE static void
 CscInit(/*@notnull@*/ NsfCallStackContent *cscPtr, NsfObject *object, NsfClass *cl,
-	Tcl_Command cmd, unsigned short frameType, unsigned short flags) {
+	Tcl_Command cmd, int frameType, int flags) {
 
   assert(cscPtr);
 
@@ -909,7 +909,7 @@
  *----------------------------------------------------------------------
  */
 NSF_INLINE static void
-CscFinish(Tcl_Interp *interp, NsfCallStackContent *cscPtr, char *msg) {
+CscFinish(Tcl_Interp *interp, NsfCallStackContent *cscPtr /*, char *msg*/) {
   int allowDestroy = RUNTIME_STATE(interp)->exitHandlerDestroyRound !=
     NSF_EXITHANDLER_ON_SOFT_DESTROY;
   NsfObject *object;
@@ -1012,7 +1012,7 @@
 
 #if defined(NRE)
   if ((cscPtr->flags & NSF_CSC_CALL_IS_NRE)) {
-    NsfTclStackFree(interp, cscPtr, msg);
+    NsfTclStackFree(interp, cscPtr, "CscFinish");
   }
 #endif
   /*fprintf(stderr, "CscFinish done\n");*/