Index: generic/nsfInt.h
===================================================================
diff -u -N -r77ba24ec459d9168dbfad4ae0c6eb4b936e8ea6b -r472a3c5f359bb9b2d0aeadc7937ba2bc6aecdbc9
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 77ba24ec459d9168dbfad4ae0c6eb4b936e8ea6b)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 472a3c5f359bb9b2d0aeadc7937ba2bc6aecdbc9)
@@ -271,10 +271,10 @@
 #if !defined(NDEBUG)
 # if defined(PRE86)
 #  define ISOBJ(o) ((o) != NULL && ISOBJ_(o))
-#  define ISOBJ_(o) ((o) != (void*)0xdeadbeaf && ((o)->typePtr ? (o)->typePtr->name != NULL : 1) && (o)->length >= -1 && ((o)->length > 0 ? (o)->bytes!= NULL : 1) && (o)->refCount >= 0)
+#  define ISOBJ_(o) ((o) != (void*)0xdeadbeaf && ((o)->typePtr ? ((o)->typePtr->name != NULL) : ((o)->bytes != NULL)) && (o)->length >= -1 && (o)->refCount >= 0)
 #  else
 #  define ISOBJ(o) ((o) != NULL && ISOBJ_(o))
-#  define ISOBJ_(o) ((o) != (void*)0xdeadbeaf && ((o)->typePtr ? (o)->typePtr->name != NULL : 1) && ((o)->bytes != NULL ? (o)->length >= 0 : 1) && (o)->refCount >= 0)
+#  define ISOBJ_(o) ((o) != (void*)0xdeadbeaf && ((o)->typePtr ? (o)->typePtr->name != NULL : ((o)->bytes != NULL)) && ((o)->bytes != NULL ? (o)->length >= 0 : 1) && (o)->refCount >= 0)
 # endif
 #else
 # define ISOBJ(o) ((o) != NULL && ISOBJ_(o))