Index: generic/nsfAPI.h
===================================================================
diff -u -r19c84744084963110f84f4ce28fbf55714c79635 -r16a02881bff0a0d626d0045dfd96660338d0c314
--- generic/nsfAPI.h	(.../nsfAPI.h)	(revision 19c84744084963110f84f4ce28fbf55714c79635)
+++ generic/nsfAPI.h	(.../nsfAPI.h)	(revision 16a02881bff0a0d626d0045dfd96660338d0c314)
@@ -868,7 +868,7 @@
 NsfCAllocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -890,7 +890,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -914,7 +914,7 @@
 NsfCDeallocMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -936,7 +936,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -961,7 +961,7 @@
 NsfCGetCachendParametersMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -983,7 +983,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1009,7 +1009,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1034,7 +1034,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1058,7 +1058,7 @@
 NsfCSuperclassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1080,7 +1080,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1105,7 +1105,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1131,7 +1131,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1157,7 +1157,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1182,7 +1182,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1227,7 +1227,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1253,7 +1253,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1283,7 +1283,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1329,7 +1329,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1354,7 +1354,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1401,7 +1401,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1429,7 +1429,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -1475,7 +1475,7 @@
   ParseContext pc;
   NsfClass *cl;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   cl = NsfObjectToClass(clientData);
@@ -2517,7 +2517,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2542,7 +2542,7 @@
 NsfOCgetMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2562,7 +2562,7 @@
 NsfOClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2582,7 +2582,7 @@
 NsfOCleanupMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2603,7 +2603,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2626,7 +2626,7 @@
 NsfODestroyMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2647,7 +2647,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2671,7 +2671,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2695,7 +2695,7 @@
 NsfOInstvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2710,7 +2710,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2734,7 +2734,7 @@
 NsfONoinitMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2754,7 +2754,7 @@
 NsfORequireNamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2774,7 +2774,7 @@
 NsfOResidualargsMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2788,7 +2788,7 @@
 NsfOUplevelMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2802,7 +2802,7 @@
 NsfOUpvarMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2816,7 +2816,7 @@
 NsfOVolatileMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2837,7 +2837,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2861,7 +2861,7 @@
 NsfObjInfoClassMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2882,7 +2882,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2906,7 +2906,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2931,7 +2931,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2956,7 +2956,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -2980,7 +2980,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3003,7 +3003,7 @@
 NsfObjInfoHasnamespaceMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3024,7 +3024,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3048,7 +3048,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3072,7 +3072,7 @@
 NsfObjInfoLookupMethodMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3093,7 +3093,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3123,7 +3123,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3167,7 +3167,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3193,7 +3193,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3218,7 +3218,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3245,7 +3245,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3269,7 +3269,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3312,7 +3312,7 @@
 NsfObjInfoNameMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3333,7 +3333,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3357,7 +3357,7 @@
 NsfObjInfoParentMethodStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST* objv) {
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3378,7 +3378,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3403,7 +3403,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;
@@ -3428,7 +3428,7 @@
   ParseContext pc;
   NsfObject *obj;
 
-  assert(clientData != NULL);
+  NSF_nonnull_assert(clientData != NULL);
   assert(objc > 0);
 
   obj = (NsfObject *)clientData;