Index: generic/nsfStack.c
===================================================================
diff -u -r134e9484601ec4c2fb68787c129d85ce3c1f5ed2 -rb361d502bbf5fc7920797d064ec21bd111d11081
--- generic/nsfStack.c	(.../nsfStack.c)	(revision 134e9484601ec4c2fb68787c129d85ce3c1f5ed2)
+++ generic/nsfStack.c	(.../nsfStack.c)	(revision b361d502bbf5fc7920797d064ec21bd111d11081)
@@ -41,8 +41,13 @@
  *
  *----------------------------------------------------------------------
  */
+static void CscListAdd(Tcl_Interp *interp, NsfCallStackContent *cscPtr) nonnull(1) nonnull(2);
+static int CscListRemove(Tcl_Interp *interp, NsfCallStackContent *cscPtr, NsfClasses **cscListPtr) nonnull(1) nonnull(2) nonnull(3);
+
 static void
 CscListAdd(Tcl_Interp *interp, NsfCallStackContent *cscPtr) {
+  assert(interp);
+  assert(cscPtr);
   NsfClassListAdd(&RUNTIME_STATE(interp)->cscList, (NsfClass *)cscPtr, NULL);
 }
 
@@ -65,6 +70,11 @@
 static int
 CscListRemove(Tcl_Interp *interp, NsfCallStackContent *cscPtr, NsfClasses **cscListPtr) {
   NsfClasses *entryPtr, **cscList = &RUNTIME_STATE(interp)->cscList;
+
+  assert(interp);
+  assert(cscPtr);
+  assert(cscListPtr);
+
   entryPtr = NsfClassListUnlink(cscList, cscPtr);
   if (entryPtr) {
     FREE(NsfClasses, entryPtr);
@@ -160,8 +170,14 @@
  *
  *----------------------------------------------------------------------
  */
+static void Nsf_PushFrameObj(Tcl_Interp *interp, NsfObject *object, CallFrame *framePtr) nonnull(1) nonnull(2) nonnull(3);
+static void Nsf_PopFrameObj(Tcl_Interp *interp, CallFrame *framePtr) nonnull(1) nonnull(2);
 
 static void Nsf_PushFrameObj(Tcl_Interp *interp, NsfObject *object, CallFrame *framePtr) {
+  assert(interp);
+  assert(object);
+  assert(framePtr);
+
   /*fprintf(stderr,"PUSH OBJECT_FRAME (Nsf_PushFrameObj) frame %p\n", framePtr);*/
   if (object->nsPtr) {
     Tcl_PushCallFrame(interp, (Tcl_CallFrame *)framePtr, object->nsPtr,
@@ -180,7 +196,10 @@
   Tcl_CallFrame_clientData(framePtr) = (ClientData)object;
 }
 
+
 static void Nsf_PopFrameObj(Tcl_Interp *interp, CallFrame *framePtr) {
+  assert(interp);
+  assert(framePtr);
 
   /*fprintf(stderr,"POP  OBJECT_FRAME (Nsf_PopFrameObj) frame %p, varTable %p set to NULL, already %d\n",
     framePtr, Tcl_CallFrame_varTablePtr(framePtr), Tcl_CallFrame_varTablePtr(framePtr) == NULL);*/
@@ -204,10 +223,17 @@
  *
  *----------------------------------------------------------------------
  */
+NSF_INLINE static void Nsf_PushFrameCsc(Tcl_Interp *interp, NsfCallStackContent *cscPtr, CallFrame *framePtr) 
+  nonnull(1) nonnull(2) nonnull(3); 
+static void Nsf_PopFrameCsc(Tcl_Interp *interp, CallFrame *UNUSED(framePtr)) nonnull(1); 
 
 NSF_INLINE static void
 Nsf_PushFrameCsc(Tcl_Interp *interp, NsfCallStackContent *cscPtr, CallFrame *framePtr) {
   CallFrame *varFramePtr = Tcl_Interp_varFramePtr(interp);
+
+  assert(interp);
+  assert(cscPtr);
+  assert(framePtr);
   /*fprintf(stderr,"PUSH CMETHOD_FRAME (Nsf_PushFrameCsc) frame %p cscPtr %p methodName %s\n",
     framePtr, cscPtr, Tcl_GetCommandName(interp, cscPtr->cmdPtr));*/
 
@@ -219,6 +245,7 @@
 
 NSF_INLINE static void
 Nsf_PopFrameCsc(Tcl_Interp *interp, CallFrame *UNUSED(framePtr)) {
+  assert(interp);
   /*fprintf(stderr,"POP CMETHOD_FRAME (Nsf_PopFrameCsc) frame %p, varTablePtr = %p\n",
     framePtr, Tcl_CallFrame_varTablePtr(framePtr));*/
   Tcl_PopCallFrame(interp);
@@ -242,9 +269,11 @@
  *
  *----------------------------------------------------------------------
  */
+static Tcl_CallFrame *CallStackGetActiveProcFrame(Tcl_CallFrame *framePtr) nonnull(1);
 
 static Tcl_CallFrame *
 CallStackGetActiveProcFrame(Tcl_CallFrame *framePtr) {
+  assert(framePtr);
   for (; framePtr; framePtr = Tcl_CallFrame_callerPtr(framePtr)) {
     register int flag = Tcl_CallFrame_isProcCallFrame(framePtr);
 
@@ -276,9 +305,12 @@
  *
  *----------------------------------------------------------------------
  */
+static Tcl_CallFrame * CallStackNextFrameOfType(Tcl_CallFrame *framePtr, int flags) nonnull(1);
 
 static Tcl_CallFrame *
 CallStackNextFrameOfType(Tcl_CallFrame *framePtr, int flags) {
+  assert(framePtr);
+
   for (; framePtr; framePtr = Tcl_CallFrame_callerPtr(framePtr)) {
     if (Tcl_CallFrame_isProcCallFrame(framePtr) & flags)
       return framePtr;
@@ -310,21 +342,24 @@
 # endif
 #endif
 
+NSF_INLINE static NsfObject *GetSelfObj(Tcl_Interp *interp) nonnull(1);
+
 NSF_INLINE static NsfObject*
 GetSelfObj(Tcl_Interp *interp) {
   register Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
+  assert(interp);
 
   /*fprintf(stderr, "GetSelfObj interp has frame %p and var-frame %p\n",
     Tcl_Interp_framePtr(interp), Tcl_Interp_varFramePtr(interp));*/
 
   for (; varFramePtr; varFramePtr =
 	
 #if defined(SKIP_LEVELS)
-	 Tcl_CallFrame_callerPtr(varFramePtr)
+			Tcl_CallFrame_callerPtr(varFramePtr)
 #else
-	 NULL
+	 		NULL
 #endif
-       ) {
+			) {
     register int flags = Tcl_CallFrame_isProcCallFrame(varFramePtr);
 
     if (likely(flags & (FRAME_IS_NSF_METHOD|FRAME_IS_NSF_CMETHOD))) {
@@ -359,13 +394,19 @@
  *
  *----------------------------------------------------------------------
  */
+static NsfCallStackContent*CallStackGetTopFrame(Tcl_Interp *interp, Tcl_CallFrame **framePtrPtr) nonnull(1);
+NSF_INLINE static NsfCallStackContent* CallStackGetTopFrame0(Tcl_Interp *interp) nonnull(1);
 
 static NsfCallStackContent*
 CallStackGetTopFrame(Tcl_Interp *interp, Tcl_CallFrame **framePtrPtr) {
-  register Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
+  register Tcl_CallFrame *varFramePtr;
 
-  for (; varFramePtr; varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) {
+  assert(interp);
 
+  for (varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp); 
+       varFramePtr; 
+       varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) {
+
       if (Tcl_CallFrame_isProcCallFrame(varFramePtr) & (FRAME_IS_NSF_METHOD|FRAME_IS_NSF_CMETHOD)) {
         if (framePtrPtr) *framePtrPtr = varFramePtr;
         return (NsfCallStackContent *)Tcl_CallFrame_clientData(varFramePtr);
@@ -377,8 +418,13 @@
 
 NSF_INLINE static NsfCallStackContent*
 CallStackGetTopFrame0(Tcl_Interp *interp) {
-  register Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
-  for (; varFramePtr; varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) {
+  register Tcl_CallFrame *varFramePtr;
+
+  assert(interp);
+
+  for (varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp); 
+       varFramePtr; 
+       varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) {
     if (likely(Tcl_CallFrame_isProcCallFrame(varFramePtr) & (FRAME_IS_NSF_METHOD|FRAME_IS_NSF_CMETHOD))) {
       return (NsfCallStackContent *)Tcl_CallFrame_clientData(varFramePtr);
     }
@@ -408,6 +454,9 @@
  *
  *----------------------------------------------------------------------
  */
+static NsfCallStackContent *NsfCallStackFindLastInvocation(Tcl_Interp *interp, int offset, Tcl_CallFrame **framePtrPtr) 
+  nonnull(1);
+
 static NsfCallStackContent *
 NsfCallStackFindLastInvocation(Tcl_Interp *interp, int offset, Tcl_CallFrame **framePtrPtr) {
   register Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
@@ -464,13 +513,16 @@
  *
  *----------------------------------------------------------------------
  */
+static NsfCallStackContent *NsfCallStackFindActiveFrame(Tcl_Interp *interp, int offset, Tcl_CallFrame **framePtrPtr) nonnull(1);
 
 static NsfCallStackContent *
 NsfCallStackFindActiveFrame(Tcl_Interp *interp, int offset, Tcl_CallFrame **framePtrPtr) {
-  register Tcl_CallFrame *varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
+  register Tcl_CallFrame *varFramePtr;
 
   /* skip #offset frames */
-  for (; offset>0 && varFramePtr; varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr), offset--);
+  for (varFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
+       offset>0 && varFramePtr; 
+       varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr), offset--);
 
   /* search for first active frame and set tcl frame pointers */
   for (; varFramePtr; varFramePtr = Tcl_CallFrame_callerPtr(varFramePtr)) {
@@ -505,11 +557,15 @@
  *
  *----------------------------------------------------------------------
  */
+static void CallStackUseActiveFrame(Tcl_Interp *interp, callFrameContext *ctx) nonnull(1) nonnull(2);
 
 static void
 CallStackUseActiveFrame(Tcl_Interp *interp, callFrameContext *ctx) {
   Tcl_CallFrame *framePtr, *inFramePtr;
 
+  assert(interp);
+  assert(ctx);
+
   inFramePtr = (Tcl_CallFrame *)Tcl_Interp_varFramePtr(interp);
 
   /* Get the first active non object frame */
@@ -544,9 +600,12 @@
  *
  *----------------------------------------------------------------------
  */
+static void CallStackRestoreSavedFrames(Tcl_Interp *interp, callFrameContext *ctx) nonnull(1) nonnull(2);
 
 static void
 CallStackRestoreSavedFrames(Tcl_Interp *interp, callFrameContext *ctx) {
+  assert(ctx);
+
   if (ctx->frameSaved) {
     /*fprintf(stderr, "CallStackRestoreSavedFrames drops %p restores %p\n",
       Tcl_Interp_varFramePtr(interp), ctx->varFramePtr);*/