Index: generic/nsfCmdDefinitions.c
===================================================================
diff -u -rcbcfec72376d549a806859c873195cc0ebc9c9ea -r24571ae44c492c681d3efd2f2d2f5169ad7d6d57
--- generic/nsfCmdDefinitions.c	(.../nsfCmdDefinitions.c)	(revision cbcfec72376d549a806859c873195cc0ebc9c9ea)
+++ generic/nsfCmdDefinitions.c	(.../nsfCmdDefinitions.c)	(revision 24571ae44c492c681d3efd2f2d2f5169ad7d6d57)
@@ -60,7 +60,7 @@
 void
 Nsf_CmdDefinitionInit(Tcl_Interp *interp) {
 
-  assert(interp);
+  assert(interp != NULL);
 
   NsfMutexLock(&cmdDefinitonMutex);
 
@@ -90,8 +90,8 @@
 Nsf_CmdDefinitionRegister(Tcl_Interp *interp, Nsf_methodDefinition *definitionRecords) {
   Nsf_methodDefinition *ePtr;
 
-  assert(interp);
-  assert(definitionRecords);
+  assert(interp != NULL);
+  assert(definitionRecords != NULL);
 
   for (ePtr = definitionRecords; ePtr->methodName; ePtr++) {
     Register(interp, ePtr);
@@ -118,7 +118,7 @@
 Nsf_CmdDefinitionGet(Tcl_ObjCmdProc *proc) {
   Tcl_HashEntry *hPtr;
 
-  assert(proc);
+  assert(proc != NULL);
 
   NsfMutexLock(&cmdDefinitonMutex);
   hPtr = Tcl_FindHashEntry(cmdDefinitonHashTablePtr, (char *)proc);
@@ -152,14 +152,14 @@
   Tcl_HashEntry *hPtr;
   int isNew;
 
-  assert(interp);
-  assert(methodDefinition);
+  assert(interp != NULL);
+  assert(methodDefinition != NULL);
 
   NsfMutexLock(&cmdDefinitonMutex);
   hPtr = Tcl_CreateHashEntry(cmdDefinitonHashTablePtr, (char *)methodDefinition->proc, &isNew);
   NsfMutexUnlock(&cmdDefinitonMutex);
 
-  if (isNew) {
+  if (isNew != 0) {
     Tcl_SetHashValue(hPtr, methodDefinition);
     return TCL_OK;
   } else {