Index: generic/nsf.c
===================================================================
diff -u -N -r22f4e55c94ff56910d48c5b3a49ea6fd6bf80d2c -ra529b8f0a29c485bb855aa73d4b94d3a95a1e13a
--- generic/nsf.c	(.../nsf.c)	(revision 22f4e55c94ff56910d48c5b3a49ea6fd6bf80d2c)
+++ generic/nsf.c	(.../nsf.c)	(revision a529b8f0a29c485bb855aa73d4b94d3a95a1e13a)
@@ -21188,7 +21188,7 @@
 static int
 ArgumentCheckHelper(Tcl_Interp *interp, Tcl_Obj *objPtr, struct Nsf_Param const *pPtr, unsigned int *flags,
                     ClientData *clientData, Tcl_Obj **outObjPtr) {
-  int objc, i, result;
+  int       objc, i, result;
   Tcl_Obj **ov;
 
   nonnull_assert(interp != NULL);
@@ -21198,7 +21198,7 @@
   nonnull_assert(clientData != NULL);
   nonnull_assert(outObjPtr != NULL);
   assert((pPtr->flags & NSF_ARG_MULTIVALUED) != 0u);
-  assert(*flags & NSF_PC_MUST_DECR);
+  assert((*flags & NSF_PC_MUST_DECR) != 0u);
 
   result = Tcl_ListObjGetElements(interp, objPtr, &objc, &ov);
   if (unlikely(result != TCL_OK)) {
@@ -21209,7 +21209,7 @@
   INCR_REF_COUNT2("valueObj", *outObjPtr);
 
   for (i = 0; i < objc; i++) {
-    Tcl_Obj *elementObjPtr = ov[i];
+    Tcl_Obj    *elementObjPtr = ov[i];
     const char *valueString = ObjStr(elementObjPtr);
 
     if ((pPtr->flags & NSF_ARG_ALLOW_EMPTY) != 0u && *valueString == '\0') {
@@ -23996,7 +23996,7 @@
     return result;
   }
 
-  assert(Tcl_Command_objProc(cmd));
+  assert(Tcl_Command_objProc(cmd) != NULL);
 
   NsfCommandRelease(tcd->aliasedCmd);
   tcd->objProc    = Tcl_Command_objProc(cmd);
@@ -26368,7 +26368,7 @@
     return result;
   }
 
-  assert(parsedParam.paramDefs);
+  assert(parsedParam.paramDefs != NULL);
   paramsPtr = parsedParam.paramDefs->paramsPtr;
   assert(paramsPtr != NULL);
 
@@ -27311,7 +27311,7 @@
       if (likely(varName != NULL)) {
         result = ImportInstVarIntoCurrentScope(interp, cmdName, object, varName, alias);
       } else {
-        assert(objv[i]);
+        assert(objv[i] != NULL);
         result = NsfPrintError(interp, "invalid variable specification '%s'", ObjStr(objv[i]));
       }
     }
@@ -28261,7 +28261,7 @@
    * GetObjectParameterDefinition() was returning TCL_OK, the paramdefs have
    * to be set.
    */
-  assert(parsedParam.paramDefs);
+  assert(parsedParam.paramDefs != NULL);
 
   /*
    * We do not stack a plain stack fraom NSF_CSC_TYPE_PLAIN here, as we do in
@@ -28907,7 +28907,7 @@
   nonnull_assert(cl != NULL);
   nonnull_assert(nameObj != NULL);
   assert(isAbsolutePath(nameString));
-  assert(NSValidObjectName(nameString, 0));
+  assert(NSValidObjectName(nameString, 0) != 0);
 
   /*
    * Create a new object from scratch.
@@ -30152,14 +30152,14 @@
 NsfObjInfoPrecedenceMethod(Tcl_Interp *interp, NsfObject *object,
                                         int withIntrinsicOnly, const char *pattern) {
   NsfClasses *precedenceList, *pl;
-  Tcl_Obj *resultObj = Tcl_NewObj();
+  Tcl_Obj    *resultObj = Tcl_NewObj();
 
   nonnull_assert(interp != NULL);
   nonnull_assert(object != NULL);
 
   precedenceList = ComputePrecedenceList(interp, object, pattern, !withIntrinsicOnly, 1);
   for (pl = precedenceList; pl; pl = pl->nextPtr) {
-    assert(pl->cl);
+    assert(pl->cl != NULL);
     Tcl_ListObjAppendElement(interp, resultObj, pl->cl->object.cmdName);
   }
   if (precedenceList != NULL) {
Index: generic/nsfProfile.c
===================================================================
diff -u -N -r22f4e55c94ff56910d48c5b3a49ea6fd6bf80d2c -ra529b8f0a29c485bb855aa73d4b94d3a95a1e13a
--- generic/nsfProfile.c	(.../nsfProfile.c)	(revision 22f4e55c94ff56910d48c5b3a49ea6fd6bf80d2c)
+++ generic/nsfProfile.c	(.../nsfProfile.c)	(revision a529b8f0a29c485bb855aa73d4b94d3a95a1e13a)
@@ -315,7 +315,7 @@
   const char     *fullMethodName, *label;
   Tcl_DString     ds;
 
-  assert(cd);
+  assert(cd != NULL);
 
   fullMethodName = ObjStr(objv[0]);
   ti = (NsfShadowTclCommandInfo *)cd;
@@ -457,7 +457,9 @@
             Tcl_Obj *nameObj = NULL;
 
             if (GetPair(interp, ov[i], 1, &nameObj, &nrArgs) == TCL_OK) {
+              assert(nameObj != NULL);
               ti[i].nrArgs = nrArgs;
+
               if (NsfReplaceCommand(interp, nameObj, Nsf_ProfileFilterObjCmd, &ti[i], &ti[i]) != TCL_OK) {
                 NsfLog(interp, NSF_LOG_WARN, "nsfprofile: list element '%s' is not a command", ObjStr(nameObj));
               }