Index: generic/nsf.c
===================================================================
diff -u -N -r95656d2638199a6292c1b2c9bc570c37020280b6 -rcd3c5e043bd743d199ce9722c20b15d38becb7a5
--- generic/nsf.c	(.../nsf.c)	(revision 95656d2638199a6292c1b2c9bc570c37020280b6)
+++ generic/nsf.c	(.../nsf.c)	(revision cd3c5e043bd743d199ce9722c20b15d38becb7a5)
@@ -7766,7 +7766,11 @@
       case CHECK_POST:
         result = AssertionCheckList(interp, object, procs->post, method);
         break;
-      default:
+      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 */
         break;
       }
     }
@@ -22614,7 +22618,7 @@
   case NSF_PARAMS_PARAMETER: listObj = ParamDefsFormat(interp, paramsPtr, contextObject, pattern); break;
   case NSF_PARAMS_LIST:      listObj = ParamDefsList(interp, paramsPtr, contextObject, pattern);   break;
   case NSF_PARAMS_NAMES:     listObj = ParamDefsNames(interp, paramsPtr, contextObject, pattern);  break;
-  default: /* NSF_PARAMS_SYNTAX:*/ listObj = NsfParamDefsSyntax(interp, paramsPtr, contextObject, pattern); break;
+  case NSF_PARAMS_SYNTAX:    listObj = NsfParamDefsSyntax(interp, paramsPtr, contextObject, pattern); break;
   }
 
   return listObj;
@@ -25694,7 +25698,8 @@
   switch (withProtection) {
   case ProtectionCall_protectedIdx:     flags = NSF_CMD_CALL_PROTECTED_METHOD; break;
   case ProtectionRedefine_protectedIdx: flags = NSF_CMD_REDEFINE_PROTECTED_METHOD; break;
-  default: flags = 0u;
+  case ProtectionNoneIdx: /* fall through */
+  case ProtectionNULL:                  flags = 0u; break;
   }
 
   if (cl != NULL) {
@@ -26128,7 +26133,10 @@
       case MethodpropertyRedefine_protectedIdx:
         flag = NSF_CMD_REDEFINE_PROTECTED_METHOD;
         break;
-      default: flag = 0;
+      case MethodpropertyNULL:       /* fall through */
+      case MethodpropertyReturnsIdx: /* fall through */
+      case MethodpropertyExistsIdx:        
+        flag = 0u;
         break;
       }