Index: generic/nsf.c
===================================================================
diff -u -N -r937c6deb1a993f4b801fbaeff074fc05a49323da -rec5702daf07d4f8ed37deb09198ebff5b3fbb1bf
--- generic/nsf.c	(.../nsf.c)	(revision 937c6deb1a993f4b801fbaeff074fc05a49323da)
+++ generic/nsf.c	(.../nsf.c)	(revision ec5702daf07d4f8ed37deb09198ebff5b3fbb1bf)
@@ -8634,11 +8634,11 @@
       case CHECK_POST:
         result = AssertionCheckList(interp, object, procs->post, method);
         break;
-      case CHECK_ALL:      /* fall through */
-      case CHECK_NONE:     /* fall through */
-      case CHECK_CLINVAR:  /* fall through */
-      case CHECK_OBJINVAR: /* fall through */
-      case CHECK_INVAR:    /* fall through */
+      case CHECK_ALL:      NSF_FALL_THROUGH; /* fall through */
+      case CHECK_NONE:     NSF_FALL_THROUGH; /* fall through */
+      case CHECK_CLINVAR:  NSF_FALL_THROUGH; /* fall through */
+      case CHECK_OBJINVAR: NSF_FALL_THROUGH; /* fall through */
+      case CHECK_INVAR:    NSF_FALL_THROUGH; /* fall through */
         break;
       }
     }
@@ -25673,11 +25673,11 @@
       return TCL_OK;
     }
 
-  case InfomethodsubcmdBodyIdx:        /* fall through */
-  case InfomethodsubcmdOriginIdx:      /* fall through */
-  case InfomethodsubcmdTypeIdx:        /* fall through */
-  case InfomethodsubcmdDefinitionIdx:  /* fall through */
-  case InfomethodsubcmdDisassembleIdx: /* fall through */
+  case InfomethodsubcmdBodyIdx:        NSF_FALL_THROUGH; /* fall through */
+  case InfomethodsubcmdOriginIdx:      NSF_FALL_THROUGH; /* fall through */
+  case InfomethodsubcmdTypeIdx:        NSF_FALL_THROUGH; /* fall through */
+  case InfomethodsubcmdDefinitionIdx:  NSF_FALL_THROUGH; /* fall through */
+  case InfomethodsubcmdDisassembleIdx: NSF_FALL_THROUGH; /* fall through */
   case InfomethodsubcmdNULL:
     break;
   }
@@ -25781,17 +25781,17 @@
         Tcl_SetObjResult(interp, resultObj);
         break;
       }
-    case InfomethodsubcmdArgsIdx:               /* fall through */
-    case InfomethodsubcmdDefinitionhandleIdx:   /* fall through */
-    case InfomethodsubcmdExistsIdx:             /* fall through */
-    case InfomethodsubcmdOriginIdx:             /* fall through */
-    case InfomethodsubcmdParameterIdx:          /* fall through */
-    case InfomethodsubcmdPostconditionIdx:      /* fall through */
-    case InfomethodsubcmdPreconditionIdx:       /* fall through */
-    case InfomethodsubcmdRegistrationhandleIdx: /* fall through */
-    case InfomethodsubcmdReturnsIdx:            /* fall through */
-    case InfomethodsubcmdSubmethodsIdx:         /* fall through */
-    case InfomethodsubcmdSyntaxIdx:             /* fall through */
+    case InfomethodsubcmdArgsIdx:               NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdDefinitionhandleIdx:   NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdExistsIdx:             NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdOriginIdx:             NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdParameterIdx:          NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdPostconditionIdx:      NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdPreconditionIdx:       NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdRegistrationhandleIdx: NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdReturnsIdx:            NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdSubmethodsIdx:         NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdSyntaxIdx:             NSF_FALL_THROUGH; /* fall through */
     case InfomethodsubcmdNULL:
     break;
     }
@@ -25821,19 +25821,19 @@
         }
       }
       break;
-    case InfomethodsubcmdArgsIdx:                /* fall through */
-    case InfomethodsubcmdBodyIdx:                /* fall through */
-    case InfomethodsubcmdDefinitionhandleIdx:    /* fall through */
-    case InfomethodsubcmdExistsIdx:              /* fall through */
-    case InfomethodsubcmdOriginIdx:              /* fall through */
-    case InfomethodsubcmdParameterIdx:           /* fall through */
-    case InfomethodsubcmdPostconditionIdx:       /* fall through */
-    case InfomethodsubcmdPreconditionIdx:        /* fall through */
-    case InfomethodsubcmdRegistrationhandleIdx:  /* fall through */
-    case InfomethodsubcmdReturnsIdx:             /* fall through */
-    case InfomethodsubcmdSubmethodsIdx:          /* fall through */
-    case InfomethodsubcmdSyntaxIdx:              /* fall through */
-    case InfomethodsubcmdDisassembleIdx:         /* fall through */
+    case InfomethodsubcmdArgsIdx:                NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdBodyIdx:                NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdDefinitionhandleIdx:    NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdExistsIdx:              NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdOriginIdx:              NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdParameterIdx:           NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdPostconditionIdx:       NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdPreconditionIdx:        NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdRegistrationhandleIdx:  NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdReturnsIdx:             NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdSubmethodsIdx:          NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdSyntaxIdx:              NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdDisassembleIdx:         NSF_FALL_THROUGH; /* fall through */
     case InfomethodsubcmdNULL:
       break;
     }
@@ -25858,19 +25858,19 @@
         Tcl_SetObjResult(interp, resultObj);
       }
       break;
-    case InfomethodsubcmdArgsIdx:                /* fall through */
-    case InfomethodsubcmdBodyIdx:                /* fall through */
-    case InfomethodsubcmdDefinitionhandleIdx:    /* fall through */
-    case InfomethodsubcmdExistsIdx:              /* fall through */
-    case InfomethodsubcmdOriginIdx:              /* fall through */
-    case InfomethodsubcmdParameterIdx:           /* fall through */
-    case InfomethodsubcmdPostconditionIdx:       /* fall through */
-    case InfomethodsubcmdPreconditionIdx:        /* fall through */
-    case InfomethodsubcmdRegistrationhandleIdx:  /* fall through */
-    case InfomethodsubcmdReturnsIdx:             /* fall through */
-    case InfomethodsubcmdSubmethodsIdx:          /* fall through */
-    case InfomethodsubcmdSyntaxIdx:              /* fall through */
-    case InfomethodsubcmdDisassembleIdx:         /* fall through */
+    case InfomethodsubcmdArgsIdx:                NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdBodyIdx:                NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdDefinitionhandleIdx:    NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdExistsIdx:              NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdOriginIdx:              NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdParameterIdx:           NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdPostconditionIdx:       NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdPreconditionIdx:        NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdRegistrationhandleIdx:  NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdReturnsIdx:             NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdSubmethodsIdx:          NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdSyntaxIdx:              NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdDisassembleIdx:         NSF_FALL_THROUGH; /* fall through */
     case InfomethodsubcmdNULL:
       break;
     }
@@ -25930,17 +25930,17 @@
           Tcl_SetObjResult(interp, resultObj);
         }
         break;
-      case InfomethodsubcmdArgsIdx:                /* fall through */
-      case InfomethodsubcmdDefinitionhandleIdx:    /* fall through */
-      case InfomethodsubcmdExistsIdx:              /* fall through */
-      case InfomethodsubcmdOriginIdx:              /* fall through */
-      case InfomethodsubcmdParameterIdx:           /* fall through */
-      case InfomethodsubcmdPostconditionIdx:       /* fall through */
-      case InfomethodsubcmdPreconditionIdx:        /* fall through */
-      case InfomethodsubcmdRegistrationhandleIdx:  /* fall through */
-      case InfomethodsubcmdReturnsIdx:             /* fall through */
-      case InfomethodsubcmdSubmethodsIdx:          /* fall through */
-      case InfomethodsubcmdSyntaxIdx:              /* fall through */
+      case InfomethodsubcmdArgsIdx:                NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdDefinitionhandleIdx:    NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdExistsIdx:              NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdOriginIdx:              NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdParameterIdx:           NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdPostconditionIdx:       NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdPreconditionIdx:        NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdRegistrationhandleIdx:  NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdReturnsIdx:             NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdSubmethodsIdx:          NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdSyntaxIdx:              NSF_FALL_THROUGH; /* fall through */
       case InfomethodsubcmdNULL:
         break;
       }
@@ -26002,18 +26002,18 @@
           break;
         }
 
-      case InfomethodsubcmdArgsIdx:                /* fall through */
-      case InfomethodsubcmdBodyIdx:                /* fall through */
-      case InfomethodsubcmdDefinitionhandleIdx:    /* fall through */
-      case InfomethodsubcmdExistsIdx:              /* fall through */
-      case InfomethodsubcmdParameterIdx:           /* fall through */
-      case InfomethodsubcmdPostconditionIdx:       /* fall through */
-      case InfomethodsubcmdPreconditionIdx:        /* fall through */
-      case InfomethodsubcmdRegistrationhandleIdx:  /* fall through */
-      case InfomethodsubcmdReturnsIdx:             /* fall through */
-      case InfomethodsubcmdSubmethodsIdx:          /* fall through */
-      case InfomethodsubcmdSyntaxIdx:              /* fall through */
-      case InfomethodsubcmdDisassembleIdx:         /* fall through */
+      case InfomethodsubcmdArgsIdx:                NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdBodyIdx:                NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdDefinitionhandleIdx:    NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdExistsIdx:              NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdParameterIdx:           NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdPostconditionIdx:       NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdPreconditionIdx:        NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdRegistrationhandleIdx:  NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdReturnsIdx:             NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdSubmethodsIdx:          NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdSyntaxIdx:              NSF_FALL_THROUGH; /* fall through */
+      case InfomethodsubcmdDisassembleIdx:         NSF_FALL_THROUGH; /* fall through */
       case InfomethodsubcmdNULL:
         break;
       }
@@ -26043,19 +26043,19 @@
             break;
           }
 
-        case InfomethodsubcmdArgsIdx:                /* fall through */
-        case InfomethodsubcmdBodyIdx:                /* fall through */
-        case InfomethodsubcmdDefinitionhandleIdx:    /* fall through */
-        case InfomethodsubcmdExistsIdx:              /* fall through */
-        case InfomethodsubcmdParameterIdx:           /* fall through */
-        case InfomethodsubcmdPostconditionIdx:       /* fall through */
-        case InfomethodsubcmdPreconditionIdx:        /* fall through */
-        case InfomethodsubcmdRegistrationhandleIdx:  /* fall through */
-        case InfomethodsubcmdReturnsIdx:             /* fall through */
-        case InfomethodsubcmdSubmethodsIdx:          /* fall through */
-        case InfomethodsubcmdSyntaxIdx:              /* fall through */
-        case InfomethodsubcmdOriginIdx:              /* fall through */
-        case InfomethodsubcmdDisassembleIdx:         /* fall through */
+        case InfomethodsubcmdArgsIdx:                NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdBodyIdx:                NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdDefinitionhandleIdx:    NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdExistsIdx:              NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdParameterIdx:           NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdPostconditionIdx:       NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdPreconditionIdx:        NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdRegistrationhandleIdx:  NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdReturnsIdx:             NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdSubmethodsIdx:          NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdSyntaxIdx:              NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdOriginIdx:              NSF_FALL_THROUGH; /* fall through */
+        case InfomethodsubcmdDisassembleIdx:         NSF_FALL_THROUGH; /* fall through */
         case InfomethodsubcmdNULL:
           break;
         }
@@ -26084,18 +26084,18 @@
     case InfomethodsubcmdOriginIdx:
       break;
 
-    case InfomethodsubcmdArgsIdx:                /* fall through */
-    case InfomethodsubcmdBodyIdx:                /* fall through */
-    case InfomethodsubcmdDefinitionhandleIdx:    /* fall through */
-    case InfomethodsubcmdExistsIdx:              /* fall through */
-    case InfomethodsubcmdParameterIdx:           /* fall through */
-    case InfomethodsubcmdPostconditionIdx:       /* fall through */
-    case InfomethodsubcmdPreconditionIdx:        /* fall through */
-    case InfomethodsubcmdRegistrationhandleIdx:  /* fall through */
-    case InfomethodsubcmdReturnsIdx:             /* fall through */
-    case InfomethodsubcmdSubmethodsIdx:          /* fall through */
-    case InfomethodsubcmdSyntaxIdx:              /* fall through */
-    case InfomethodsubcmdDisassembleIdx:         /* fall through */
+    case InfomethodsubcmdArgsIdx:                NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdBodyIdx:                NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdDefinitionhandleIdx:    NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdExistsIdx:              NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdParameterIdx:           NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdPostconditionIdx:       NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdPreconditionIdx:        NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdRegistrationhandleIdx:  NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdReturnsIdx:             NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdSubmethodsIdx:          NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdSyntaxIdx:              NSF_FALL_THROUGH; /* fall through */
+    case InfomethodsubcmdDisassembleIdx:         NSF_FALL_THROUGH; /* fall through */
     case InfomethodsubcmdNULL:
       break;
     }
@@ -26342,7 +26342,7 @@
   case CallprotectionPublicIdx: result = (isProtected == 0); break;
   case CallprotectionProtectedIdx: result = (isProtected && !isPrivate); break;
   case CallprotectionPrivateIdx: result = isPrivate; break;
-  case CallprotectionNULL: /* fall through */
+  case CallprotectionNULL: NSF_FALL_THROUGH; /* fall through */
   default: result = NSF_TRUE; break;
   }
   return result;
@@ -27822,7 +27822,7 @@
 
   switch (option) {
 
-  case ConfigureoptionDebugIdx: /* fall through */
+  case ConfigureoptionDebugIdx: NSF_FALL_THROUGH; /* fall through */
   case ConfigureoptionObjectsystemsIdx:
     /*
      * Handled above.
@@ -28612,8 +28612,8 @@
   switch (withProtection) {
   case ProtectionCall_protectedIdx:     flags = NSF_CMD_CALL_PROTECTED_METHOD; break;
   case ProtectionRedefine_protectedIdx: flags = NSF_CMD_REDEFINE_PROTECTED_METHOD; break;
-  case ProtectionNoneIdx: /* fall through */
-  case ProtectionNULL:    /* fall through */
+  case ProtectionNoneIdx: NSF_FALL_THROUGH; /* fall through */
+  case ProtectionNULL:    NSF_FALL_THROUGH; /* fall through */
   default:                flags = 0u; break;
   }
 
@@ -29044,12 +29044,12 @@
   case MethodpropertyExistsIdx:
     Tcl_SetObjResult(interp, Tcl_NewIntObj(1));
     break;
-  case MethodpropertyClass_onlyIdx:          /* fall through */
-  case MethodpropertyCall_privateIdx:        /* fall through */
-  case MethodpropertyCall_protectedIdx:      /* fall through */
-  case MethodpropertyDebugIdx:               /* fall through */
-  case MethodpropertyDeprecatedIdx:          /* fall through */
-  case MethodpropertyRedefine_protectedIdx:  /* fall through */
+  case MethodpropertyClass_onlyIdx:          NSF_FALL_THROUGH; /* fall through */
+  case MethodpropertyCall_privateIdx:        NSF_FALL_THROUGH; /* fall through */
+  case MethodpropertyCall_protectedIdx:      NSF_FALL_THROUGH; /* fall through */
+  case MethodpropertyDebugIdx:               NSF_FALL_THROUGH; /* fall through */
+  case MethodpropertyDeprecatedIdx:          NSF_FALL_THROUGH; /* fall through */
+  case MethodpropertyRedefine_protectedIdx:  NSF_FALL_THROUGH; /* fall through */
     {
       int impliedSetFlag = 0, impliedClearFlag = 0;
 
@@ -29074,8 +29074,8 @@
       case MethodpropertyRedefine_protectedIdx:
         flag = NSF_CMD_REDEFINE_PROTECTED_METHOD;
         break;
-      case MethodpropertyNULL:       /* fall through */
-      case MethodpropertyReturnsIdx: /* fall through */
+      case MethodpropertyNULL:       NSF_FALL_THROUGH; /* fall through */
+      case MethodpropertyReturnsIdx: NSF_FALL_THROUGH; /* fall through */
       case MethodpropertyExistsIdx:
         flag = 0u;
         break;
@@ -30391,7 +30391,7 @@
    * or handling other simple cases.
    */
   switch (type) {
-  case RelationtypeObject_filterIdx: /* fall through */
+  case RelationtypeObject_filterIdx: NSF_FALL_THROUGH; /* fall through */
   case RelationtypeObject_mixinIdx:
     if (valueObj == NULL) {
       objopt = object->opt;
@@ -30407,7 +30407,7 @@
     objopt = NsfRequireObjectOpt(object);
     break;
 
-  case RelationtypeClass_mixinIdx: /* fall through */
+  case RelationtypeClass_mixinIdx: NSF_FALL_THROUGH; /* fall through */
   case RelationtypeClass_filterIdx:
     assert(class != NULL);
     if (valueObj == NULL) {
@@ -30617,9 +30617,9 @@
     }
     break;
 
-  case RelationtypeClassIdx:      /* fall through */
-  case RelationtypeRootclassIdx:  /* fall through */
-  case RelationtypeSuperclassIdx: /* fall through */
+  case RelationtypeClassIdx:      NSF_FALL_THROUGH; /* fall through */
+  case RelationtypeRootclassIdx:  NSF_FALL_THROUGH; /* fall through */
+  case RelationtypeSuperclassIdx: NSF_FALL_THROUGH; /* fall through */
   case RelationtypeNULL:
     /* handled above */
     break;
@@ -30684,7 +30684,7 @@
   assert(object != NULL);
 
   switch (option) {
-  case CurrentoptionMethodIdx: /* fall through */
+  case CurrentoptionMethodIdx: NSF_FALL_THROUGH; /* fall through */
   case CurrentoptionProcIdx:
     cscPtr = CallStackGetTopFrame0(interp);
     if (cscPtr != NULL) {
@@ -30849,7 +30849,7 @@
     break;
   }
 
-  case CurrentoptionObjectIdx: /* fall through */
+  case CurrentoptionObjectIdx: NSF_FALL_THROUGH; /* fall through */
   case CurrentoptionNULL:
     /* handled above */
     break;
@@ -32409,7 +32409,7 @@
         }
         break;
       }
-    case NO_DASH: /* fall through */
+    case NO_DASH: NSF_FALL_THROUGH; /* fall through */
     default:
       {
         return NsfPrintError(interp, "%s configure: unexpected argument '%s' between parameters",
Index: generic/nsf.h
===================================================================
diff -u -N -rb604626384c5692394df7e276ac9c10e6229dbfd -rec5702daf07d4f8ed37deb09198ebff5b3fbb1bf
--- generic/nsf.h	(.../nsf.h)	(revision b604626384c5692394df7e276ac9c10e6229dbfd)
+++ generic/nsf.h	(.../nsf.h)	(revision ec5702daf07d4f8ed37deb09198ebff5b3fbb1bf)
@@ -398,6 +398,13 @@
 # define NSF_attribute_format(ARGS)
 #endif
 
+#if __GNUC_PREREQ(7, 0)
+# define NSF_FALL_THROUGH __attribute__((fallthrough))
+#else
+# define NSF_FALL_THROUGH ((void)0)
+#endif
+
+
 EXTERN int
 NsfArgumentError(Tcl_Interp *interp, const char *errorMsg, Nsf_Param const *paramPtr,
 		 Tcl_Obj *cmdNameObj, Tcl_Obj *methodPathObj)
Index: generic/nsfFunPtrHashTable.c
===================================================================
diff -u -N -ra963e8896fd07c345ccfa034cbd043344edbf083 -rec5702daf07d4f8ed37deb09198ebff5b3fbb1bf
--- generic/nsfFunPtrHashTable.c	(.../nsfFunPtrHashTable.c)	(revision a963e8896fd07c345ccfa034cbd043344edbf083)
+++ generic/nsfFunPtrHashTable.c	(.../nsfFunPtrHashTable.c)	(revision ec5702daf07d4f8ed37deb09198ebff5b3fbb1bf)
@@ -52,10 +52,10 @@
  * pointers safely.
  *
  */
-static unsigned int FunPtrKey(Tcl_HashTable *tablePtr, void *keyPtr);
-static int CompareFunPtrKeys(void *keyPtr, Tcl_HashEntry *hPtr);
-static Tcl_HashEntry *AllocFunPtrEntry(Tcl_HashTable *tablePtr, void *keyPtr);
 
+static Tcl_HashKeyProc         FunPtrKey;
+static Tcl_CompareHashKeysProc CompareFunPtrKeys;
+static Tcl_AllocHashEntryProc  AllocFunPtrEntry;
 
 typedef struct funPtrEntry_t {
   Nsf_AnyFun *funPtr;
Index: generic/nsfInt.h
===================================================================
diff -u -N -r6dc8e9ad86389cbd2d3b5136fbd6f58337929cf1 -rec5702daf07d4f8ed37deb09198ebff5b3fbb1bf
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 6dc8e9ad86389cbd2d3b5136fbd6f58337929cf1)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision ec5702daf07d4f8ed37deb09198ebff5b3fbb1bf)
@@ -174,8 +174,9 @@
 #endif
 
 #define nonnull_assert(assertion) assert((assertion))
+
 /*
- * Tries to use gcc __attribute__ unused and mangles the name, so the
+ * Trie to use gcc __attribute__ unused and mangle the name, so the
  * attribute could not be used, if declared as unused.
  */
 #ifdef UNUSED
Index: library/mongodb/nsfmongo.c
===================================================================
diff -u -N -r4e80fb687a82af0fc9ac0d109863931f4910de4a -rec5702daf07d4f8ed37deb09198ebff5b3fbb1bf
--- library/mongodb/nsfmongo.c	(.../nsfmongo.c)	(revision 4e80fb687a82af0fc9ac0d109863931f4910de4a)
+++ library/mongodb/nsfmongo.c	(.../nsfmongo.c)	(revision ec5702daf07d4f8ed37deb09198ebff5b3fbb1bf)
@@ -300,12 +300,12 @@
       elemObj = Tcl_NewByteArrayObj(bytes, (int)length);
       break;
     }
-    case BSON_TYPE_CODE:       /* fall through */
-    case BSON_TYPE_CODEWSCOPE: /* fall through */
-    case BSON_TYPE_DBPOINTER:  /* fall through */
-    case BSON_TYPE_EOD:        /* fall through */
-    case BSON_TYPE_SYMBOL:     /* fall through */
-    case BSON_TYPE_UNDEFINED:  /* fall through */
+    case BSON_TYPE_CODE:       NSF_FALL_THROUGH; /* fall through */
+    case BSON_TYPE_CODEWSCOPE: NSF_FALL_THROUGH; /* fall through */
+    case BSON_TYPE_DBPOINTER:  NSF_FALL_THROUGH; /* fall through */
+    case BSON_TYPE_EOD:        NSF_FALL_THROUGH; /* fall through */
+    case BSON_TYPE_SYMBOL:     NSF_FALL_THROUGH; /* fall through */
+    case BSON_TYPE_UNDEFINED:  NSF_FALL_THROUGH; /* fall through */
     default:
       tag = NSF_BSON_UNKNOWN;
       elemObj = Tcl_NewStringObj("", 0);