Index: generic/nsfEnumerationType.c
===================================================================
diff -u -r9e00fd16244c59971f9d0ee692104eeba4be6cd0 -r24571ae44c492c681d3efd2f2d2f5169ad7d6d57
--- generic/nsfEnumerationType.c	(.../nsfEnumerationType.c)	(revision 9e00fd16244c59971f9d0ee692104eeba4be6cd0)
+++ generic/nsfEnumerationType.c	(.../nsfEnumerationType.c)	(revision 24571ae44c492c681d3efd2f2d2f5169ad7d6d57)
@@ -59,7 +59,7 @@
 void
 Nsf_EnumerationTypeInit(Tcl_Interp *interp) {
 
-  assert(interp);
+  assert(interp != NULL);
 
   NsfMutexLock(&enumerationMutex);
 
@@ -89,8 +89,8 @@
 Nsf_EnumerationTypeRegister(Tcl_Interp *interp, Nsf_EnumeratorConverterEntry *typeRecords) {
   Nsf_EnumeratorConverterEntry *ePtr;
 
-  assert(interp);
-  assert(typeRecords);
+  assert(interp != NULL);
+  assert(typeRecords != NULL);
 
   for (ePtr = typeRecords; ePtr->converter; ePtr++) {
     int result = Register(interp, ePtr->domain, ePtr->converter);
@@ -122,7 +122,7 @@
   Tcl_HashSearch hSrch;
   const char* domain = NULL;
 
-  assert(converter);
+  assert(converter != NULL);
 
   NsfMutexLock(&enumerationMutex);
 
@@ -160,14 +160,14 @@
   Tcl_HashEntry *hPtr;
   int isNew;
 
-  assert(interp);
-  assert(converter);
+  assert(interp != NULL);
+  assert(converter != NULL);
 
   NsfMutexLock(&enumerationMutex);
   hPtr = Tcl_CreateHashEntry(enumerationHashTablePtr, domain, &isNew);
   NsfMutexUnlock(&enumerationMutex);
 
-  if (isNew) {
+  if (isNew != 0) {
     Tcl_SetHashValue(hPtr, converter);
   } else {
     /*