Index: generic/nsfShadow.c
===================================================================
diff -u -r5a44ade20d030bbe3fc3b19b0edc226e5d5e8c1b -r114f2ea7bff3f3d2e35c001e3c85b43baa0bc66b
--- generic/nsfShadow.c	(.../nsfShadow.c)	(revision 5a44ade20d030bbe3fc3b19b0edc226e5d5e8c1b)
+++ generic/nsfShadow.c	(.../nsfShadow.c)	(revision 114f2ea7bff3f3d2e35c001e3c85b43baa0bc66b)
@@ -214,9 +214,9 @@
   cmd = Tcl_FindCommand(interp, ObjStr(objv[1]), (Tcl_Namespace *)NULL, 0);
   if (cmd != NULL) {
     Tcl_ObjCmdProc *proc =  Tcl_Command_objProc(cmd);
-    ClientData clientData = Tcl_Command_objClientData(cmd);
-    if (proc == NsfProcStub && clientData) {
-      NsfProcClientData *tcd = clientData;
+    ClientData      procClientData = Tcl_Command_objClientData(cmd);
+    if (proc == NsfProcStub && procClientData != NULL) {
+      NsfProcClientData *tcd = procClientData;
       Tcl_Obj *ov[2];
       /*
        * The command is from an nsf::proc
@@ -262,17 +262,16 @@
   cmd = Tcl_FindCommand(interp, ObjStr(objv[1]), (Tcl_Namespace *)NULL, 0);
   if (cmd != NULL) {
     Tcl_ObjCmdProc *proc =  Tcl_Command_objProc(cmd);
-    ClientData clientData = Tcl_Command_objClientData(cmd);
-    NsfObject *object = NsfGetObjectFromCmdPtr(cmd);
-    Tcl_Command parentCmd;
-    char *newName = ObjStr(objv[2]);
-          
+    ClientData      procClientData = Tcl_Command_objClientData(cmd);
+    NsfObject      *object = NsfGetObjectFromCmdPtr(cmd);
+    Tcl_Command     parentCmd;
+    char           *newName = ObjStr(objv[2]);
     
-    if (proc == NsfProcStub && clientData != NULL &&
+    if (proc == NsfProcStub && procClientData != NULL &&
         *newName != '\0') {
       Tcl_DString fqNewName;
       int result;
-      NsfProcClientData *tcd = clientData;
+      NsfProcClientData *tcd = procClientData;
 
       Tcl_DStringInit(&fqNewName);
       Tcl_DStringAppend(&fqNewName, "::nsf::procs::", 14);