Index: generic/nsfInt.h
===================================================================
diff -u -rbdfa0fc0d417405db109b2099da713dc4a0daa6f -r8eda3322a7c8ba5e61c427f41e1bb90d40dd72e2
--- generic/nsfInt.h	(.../nsfInt.h)	(revision bdfa0fc0d417405db109b2099da713dc4a0daa6f)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 8eda3322a7c8ba5e61c427f41e1bb90d40dd72e2)
@@ -272,15 +272,10 @@
 #endif
 
 #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) : ((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) : ((o)->bytes != NULL)) && (o)->length >= -1 && (o)->refCount >= 0)
-# endif
-#else
 # define ISOBJ(o) ((o) != NULL && ISOBJ_(o))
+# define ISOBJ_(o) ((o) != (void*)0xdeadbeaf && (((o)->typePtr != NULL) ? ((o)->typePtr->name != NULL) : ((o)->bytes != NULL)) && (((o)->bytes != NULL) ? (o)->length >= -1 : 1) && (o)->refCount >= 0)
+#else
+# define ISOBJ(o)
 #endif
 
 #define NSF_ABBREV_MIN_CHARS 4