Index: generic/nsfShadow.c
===================================================================
diff -u -r1d1ca561af5942718e613929b36e5d2419e4fe5a -rb089be700bb58579a48e77619512a47eb3c5562d
--- generic/nsfShadow.c	(.../nsfShadow.c)	(revision 1d1ca561af5942718e613929b36e5d2419e4fe5a)
+++ generic/nsfShadow.c	(.../nsfShadow.c)	(revision b089be700bb58579a48e77619512a47eb3c5562d)
@@ -39,6 +39,11 @@
 #include "nsfAccessInt.h"
 #include "nsfCmdPtr.c"
 
+static Tcl_ObjCmdProc Nsf_InfoFrameObjCmd;
+EXTERN Tcl_ObjCmdProc NsfProcStub;
+static Tcl_ObjCmdProc Nsf_InfoBodyObjCmd;
+static Tcl_ObjCmdProc Nsf_RenameObjCmd;
+
 /*
  *----------------------------------------------------------------------
  * NsfReplaceCommandCleanup --
@@ -192,11 +197,9 @@
  *
  *----------------------------------------------------------------------
  */
-EXTERN int NsfProcStub(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-  nonnull(1) nonnull(2) nonnull(4);
 
 static int
-Nsf_InfoBodyObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+Nsf_InfoBodyObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   Tcl_Command cmd;
 
   nonnull_assert(interp != NULL);
@@ -244,8 +247,9 @@
  *
  *----------------------------------------------------------------------
  */
+
 static int
-Nsf_RenameObjCmd(ClientData clientData, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+Nsf_RenameObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   Tcl_Command cmd;
 
   if (objc != 3) {
@@ -293,8 +297,9 @@
  *
  *----------------------------------------------------------------------
  */
+
 static int
-Nsf_InfoFrameObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
+Nsf_InfoFrameObjCmd(ClientData UNUSED(clientData), Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]) {
   int result;
 
   result = NsfCallCommand(interp, NSF_INFO_FRAME, objc, objv);