Index: generic/nsf.c
===================================================================
diff -u -r1dad927c0b8c125b98c185b5ffa7b3b7eb947e66 -r9cae9f80af4fe547559e5c1391ac706fe4fc8575
--- generic/nsf.c	(.../nsf.c)	(revision 1dad927c0b8c125b98c185b5ffa7b3b7eb947e66)
+++ generic/nsf.c	(.../nsf.c)	(revision 9cae9f80af4fe547559e5c1391ac706fe4fc8575)
@@ -33059,7 +33059,7 @@
     return result;
   }
 
-  Nsf_CmdDefinitionInit(interp);
+  Nsf_CmdDefinitionInit();
   Nsf_CmdDefinitionRegister(interp, method_definitions);
 
   /*
Index: generic/nsfCmdDefinitions.c
===================================================================
diff -u -r23581e9c7855932e91f34bb638529990e9105d18 -r9cae9f80af4fe547559e5c1391ac706fe4fc8575
--- generic/nsfCmdDefinitions.c	(.../nsfCmdDefinitions.c)	(revision 23581e9c7855932e91f34bb638529990e9105d18)
+++ generic/nsfCmdDefinitions.c	(.../nsfCmdDefinitions.c)	(revision 9cae9f80af4fe547559e5c1391ac706fe4fc8575)
@@ -60,10 +60,8 @@
  *----------------------------------------------------------------------
  */
 void
-Nsf_CmdDefinitionInit(Tcl_Interp *interp) {
+Nsf_CmdDefinitionInit(void) {
 
-  nonnull_assert(interp != NULL);
-
   NsfMutexLock(&cmdDefinitionMutex);
 
   if (cmdDefinitionRefCount == 0) {
Index: generic/nsfInt.h
===================================================================
diff -u -r0ca1bf1c5b3e4a029e935e5f8a42221b61c0d747 -r9cae9f80af4fe547559e5c1391ac706fe4fc8575
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 0ca1bf1c5b3e4a029e935e5f8a42221b61c0d747)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 9cae9f80af4fe547559e5c1391ac706fe4fc8575)
@@ -1254,8 +1254,7 @@
 /*
  * NSF command definitions interface
  */
-EXTERN void Nsf_CmdDefinitionInit(Tcl_Interp *interp)
-  nonnull(1);
+EXTERN void Nsf_CmdDefinitionInit(void);
 
 EXTERN void Nsf_CmdDefinitionRelease(Tcl_Interp *interp)
   nonnull(1);