Index: generic/nsfShadow.c
===================================================================
diff -u -rcbcfec72376d549a806859c873195cc0ebc9c9ea -r24571ae44c492c681d3efd2f2d2f5169ad7d6d57
--- generic/nsfShadow.c	(.../nsfShadow.c)	(revision cbcfec72376d549a806859c873195cc0ebc9c9ea)
+++ generic/nsfShadow.c	(.../nsfShadow.c)	(revision 24571ae44c492c681d3efd2f2d2f5169ad7d6d57)
@@ -62,7 +62,7 @@
   int result = TCL_OK;
   NsfShadowTclCommandInfo *ti = &RUNTIME_STATE(interp)->tclCommands[name-NSF_EXPR];
 
-  assert(interp);
+  assert(interp != NULL);
 
   /*fprintf(stderr," cleanup for %s  ti=%p in %p\n", NsfGlobalStrings[name], ti, interp);*/
   cmd = Tcl_GetCommandFromObj(interp, NsfGlobalObjs[name]);
@@ -98,8 +98,8 @@
   NsfShadowTclCommandInfo *ti = &RUNTIME_STATE(interp)->tclCommands[name-NSF_EXPR];
   Tcl_Command cmd;
 
-  assert(interp);
-  assert(proc);
+  assert(interp != NULL);
+  assert(proc != NULL);
 
   cmd = Tcl_GetCommandFromObj(interp, NsfGlobalObjs[name]);
 
@@ -140,7 +140,7 @@
   NsfShadowTclCommandInfo *ti = &RUNTIME_STATE(interp)->tclCommands[name-NSF_EXPR];
   int result = TCL_OK;
 
-  assert(interp);
+  assert(interp != NULL);
 
   /*fprintf(stderr,"NsfReplaceCommand %d\n", name);*/
   cmd = Tcl_GetCommandFromObj(interp, NsfGlobalObjs[name]);
@@ -158,7 +158,7 @@
 	ti->proc = objProc;
 	ti->clientData = Tcl_Command_objClientData(cmd);
       }
-      if (nsfReplacementProc) {
+      if (nsfReplacementProc != NULL) {
 	Tcl_Command_objProc(cmd) = nsfReplacementProc;
       }
     }
@@ -194,16 +194,16 @@
 Nsf_InfoBodyObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   Tcl_Command cmd;
 
-  assert(interp);
-  assert(objv);
+  assert(interp != NULL);
+  assert(objv != NULL);
 
   if (objc != 2) {
     /* wrong # args, let Tcl generate the error */
     return NsfCallCommand(interp, NSF_INFO_BODY, objc, objv);
   }
 
   cmd = Tcl_FindCommand(interp, ObjStr(objv[1]), (Tcl_Namespace *)NULL, 0);
-  if (cmd) {
+  if (cmd != NULL) {
     Tcl_ObjCmdProc *proc =  Tcl_Command_objProc(cmd);
     ClientData clientData = Tcl_Command_objClientData(cmd);
     if (proc == NsfProcStub && clientData) {
@@ -250,9 +250,9 @@
 
   /* if an obj/cl should be renamed => call the Nsf move method */
   cmd = Tcl_FindCommand(interp, ObjStr(objv[1]), (Tcl_Namespace *)NULL, 0);
-  if (cmd) {
+  if (cmd != NULL) {
     NsfObject *object = NsfGetObjectFromCmdPtr(cmd);
-    Tcl_Obj *methodObj = object ? NsfMethodObj(object, NSF_o_move_idx) : NULL;
+    Tcl_Obj *methodObj = (object != NULL) ? NsfMethodObj(object, NSF_o_move_idx) : NULL;
     Tcl_Command parentCmd;
 
     if (object && methodObj) {
@@ -262,7 +262,7 @@
 
     parentCmd = Tcl_FindCommand(interp,  Tcl_Command_nsPtr(cmd)->fullName,
 			     (Tcl_Namespace *)NULL, 0);
-    if (parentCmd) {
+    if (parentCmd != NULL) {
       NsfObjectMethodEpochIncr("::rename");
     }
   }
@@ -315,7 +315,7 @@
       varFramePtr = varFramePtr->callerPtr;
     }
 
-    frameFlags = varFramePtr ? Tcl_CallFrame_isProcCallFrame(varFramePtr) : 0;
+    frameFlags = (varFramePtr != NULL) ? Tcl_CallFrame_isProcCallFrame(varFramePtr) : 0;
     /*fprintf(stderr, " ... frame %p varFramePtr %p frameFlags %.6x\n",
       framePtr, varFramePtr, frameFlags);
       Tcl85showStack(interp);*/
@@ -340,12 +340,10 @@
       Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("object",6));
       Tcl_ListObjAppendElement(interp, listObj, cscPtr->self->cmdName);
       Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("class",5));
-      Tcl_ListObjAppendElement(interp, listObj, cscPtr->cl
-			       ? cscPtr->cl->object.cmdName
+      Tcl_ListObjAppendElement(interp, listObj, (cscPtr->cl != NULL) ? cscPtr->cl->object.cmdName
 			       : NsfGlobalObjs[NSF_EMPTY]);
       Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("method",6));
-      Tcl_ListObjAppendElement(interp, listObj, cscPtr->cmdPtr
-			       ? Tcl_NewStringObj(Tcl_GetCommandName(interp, cscPtr->cmdPtr), -1)
+      Tcl_ListObjAppendElement(interp, listObj, (cscPtr->cmdPtr != NULL) ? Tcl_NewStringObj(Tcl_GetCommandName(interp, cscPtr->cmdPtr), -1)
 			       : NsfGlobalObjs[NSF_EMPTY]);
       Tcl_ListObjAppendElement(interp, listObj, Tcl_NewStringObj("frametype",9));
       if (cscPtr->frameType == NSF_CSC_TYPE_PLAIN) {
@@ -399,7 +397,7 @@
 int
 NsfShadowTclCommands(Tcl_Interp *interp, NsfShadowOperations load) {
   int rc = TCL_OK;
-  assert(interp);
+  assert(interp != NULL);
 
   if (load == SHADOW_LOAD) {
     int initialized = (RUNTIME_STATE(interp)->tclCommands != NULL);