Index: generic/nsf.c
===================================================================
diff -u -N -rd7bc5d6344a2648519087a1450071b28660b9977 -r405ace784414b362cf5594619e12776fa8454c2d
--- generic/nsf.c	(.../nsf.c)	(revision d7bc5d6344a2648519087a1450071b28660b9977)
+++ generic/nsf.c	(.../nsf.c)	(revision 405ace784414b362cf5594619e12776fa8454c2d)
@@ -3158,7 +3158,9 @@
 
     if (baseClass->order != NULL) {
       NsfClassListFree(baseClass->order);
-      baseClass->order = NULL;
+      /*
+       * baseClass->order is reset below.
+       */
     }
 
 
@@ -8477,15 +8479,15 @@
       Nsf_PushFrameObj(interp, object, framePtr);
 
       /*
-       * Don't check assertion during assertion check.
+       * Don't check assertions during the condition check.
        */
       savedCheckoptions = object->opt->checkoptions;
       object->opt->checkoptions = CHECK_NONE;
 
       /* fprintf(stderr, "Checking Assertion %s ", assStr); */
 
       /*
-       * now check the assertion in the pushed call-frame's scope
+       * Now check the condition in the pushed call-frame's scope.
        */
       acResult = CheckConditionInScope(interp, alist->content);
       if (acResult != TCL_OK) {
@@ -29236,10 +29238,10 @@
   }
 
   if (systemMethodsObj != NULL) {
-    int oc, idx, result;
+    int       oc, idx;
     Tcl_Obj **ov;
 
-    if ((result = Tcl_ListObjGetElements(interp, systemMethodsObj, &oc, &ov)) == TCL_OK) {
+    if ((Tcl_ListObjGetElements(interp, systemMethodsObj, &oc, &ov)) == TCL_OK) {
       int i;
 
       if (oc % 2) {
@@ -29248,7 +29250,7 @@
       }
       for (i = 0; i < oc; i += 2) {
         Tcl_Obj *arg, **arg_ov;
-        int arg_oc = -1;
+        int      arg_oc = -1, result;
 
         arg = ov[i+1];
         result = Tcl_GetIndexFromObj(interp, ov[i], Nsf_SystemMethodOpts, "system method", 0, &idx);