Index: generic/nsfError.c
===================================================================
diff -u -r2e1a88ed8dfe12a82274e26f1e79156d69b618fc -r16a02881bff0a0d626d0045dfd96660338d0c314
--- generic/nsfError.c	(.../nsfError.c)	(revision 2e1a88ed8dfe12a82274e26f1e79156d69b618fc)
+++ generic/nsfError.c	(.../nsfError.c)	(revision 16a02881bff0a0d626d0045dfd96660338d0c314)
@@ -148,8 +148,8 @@
 {
     va_list         ap;
 
-    assert(dsPtr != NULL);
-    assert(fmt != NULL);
+    nonnull_assert(dsPtr != NULL);
+    nonnull_assert(fmt != NULL);
 
     va_start(ap, fmt);
     NsfDStringVPrintf(dsPtr, fmt, ap);
@@ -174,8 +174,8 @@
 void
 NsfDStringArgv(Tcl_DString *dsPtr, int objc, Tcl_Obj *CONST objv[]) {
 
-  assert(dsPtr != NULL);
-  assert(objv != NULL);
+  nonnull_assert(dsPtr != NULL);
+  nonnull_assert(objv != NULL);
 
   if (objc > 0) {
     int i;
@@ -281,8 +281,8 @@
 		Tcl_Obj *methodPathObj, char *arglist) {
   int need_space = 0;
 
-  assert(interp != NULL);
-  assert(msg != NULL);
+  nonnull_assert(interp != NULL);
+  nonnull_assert(msg != NULL);
 
   Tcl_ResetResult(interp);
   Tcl_AppendResult(interp, msg, " should be \"", (char *) NULL);
@@ -333,9 +333,9 @@
               Tcl_Obj *cmdNameObj, Tcl_Obj *methodPathObj) {
   Tcl_Obj *argStringObj = NsfParamDefsSyntax(interp, paramPtr, NULL, NULL);
 
-  assert(interp != NULL);
-  assert(errorMsg != NULL);
-  assert(paramPtr != NULL);
+  nonnull_assert(interp != NULL);
+  nonnull_assert(errorMsg != NULL);
+  nonnull_assert(paramPtr != NULL);
 
   NsfObjWrongArgs(interp, errorMsg, cmdNameObj, methodPathObj, ObjStr(argStringObj));
   DECR_REF_COUNT2("paramDefsObj", argStringObj);
@@ -365,10 +365,10 @@
 			   Tcl_Obj *methodPathObj) {
   Tcl_DString ds, *dsPtr = &ds;
 
-  assert(interp != NULL);
-  assert(argumentString != NULL);
-  assert(paramPtr != NULL);
-  assert(methodPathObj != NULL);
+  nonnull_assert(interp != NULL);
+  nonnull_assert(argumentString != NULL);
+  nonnull_assert(paramPtr != NULL);
+  nonnull_assert(methodPathObj != NULL);
 
   DSTRING_INIT(dsPtr);
   Tcl_DStringAppend(dsPtr, "invalid argument '", -1);
@@ -405,11 +405,11 @@
   Tcl_DString ds, *dsPtr = &ds;
   Nsf_Param const *pPtr;
 
-  assert(interp != NULL);
-  assert(argumentString != NULL);
-  assert(currentParamPtr != NULL);
-  assert(paramPtr != NULL);
-  assert(methodPathObj != NULL);
+  nonnull_assert(interp != NULL);
+  nonnull_assert(argumentString != NULL);
+  nonnull_assert(currentParamPtr != NULL);
+  nonnull_assert(paramPtr != NULL);
+  nonnull_assert(methodPathObj != NULL);
 
   DSTRING_INIT(dsPtr);
   Tcl_DStringAppend(dsPtr, "invalid non-positional argument '", -1);
@@ -450,9 +450,9 @@
 NsfDispatchClientDataError(Tcl_Interp *interp, ClientData clientData,
 			   const char *what, const char *methodName) {
 
-  assert(interp != NULL);
-  assert(what != NULL);
-  assert(methodName != NULL);
+  nonnull_assert(interp != NULL);
+  nonnull_assert(what != NULL);
+  nonnull_assert(methodName != NULL);
 
   if (clientData != NULL) {
     return NsfPrintError(interp, "method %s not dispatched on valid %s",
@@ -481,7 +481,7 @@
 int
 NsfNoCurrentObjectError(Tcl_Interp *interp, const char *what) {
 
-  assert(interp != NULL);
+  nonnull_assert(interp != NULL);
 
   return NsfPrintError(interp, "no current object; %s called outside the context of a Next Scripting method",
                        (what != NULL) ? what : "command");