Index: TODO
===================================================================
diff -u -rce6d76dc0353274665973facb2546678bc7ebd92 -r9beee9e5c366bb49ecb22c5a399b58f73fbde040
--- TODO	(.../TODO)	(revision ce6d76dc0353274665973facb2546678bc7ebd92)
+++ TODO	(.../TODO)	(revision 9beee9e5c366bb49ecb22c5a399b58f73fbde040)
@@ -5388,9 +5388,9 @@
 - added option "-dependent" to "info subclass"
 - extended regression test
 
-
 nsf.c:
 - move NsfMethodNamePath() out of NsfObjWrongArgs()
+- move NsfMethodNamePath() out of NsfUnexpectedArgumentError() and NsfUnexpectedNonposArgumentError()
 ========================================================================
 TODO:
 
Index: generic/nsfError.c
===================================================================
diff -u -rce6d76dc0353274665973facb2546678bc7ebd92 -r9beee9e5c366bb49ecb22c5a399b58f73fbde040
--- generic/nsfError.c	(.../nsfError.c)	(revision ce6d76dc0353274665973facb2546678bc7ebd92)
+++ generic/nsfError.c	(.../nsfError.c)	(revision 9beee9e5c366bb49ecb22c5a399b58f73fbde040)
@@ -235,7 +235,7 @@
  */
 int
 NsfObjWrongArgs(Tcl_Interp *interp, CONST char *msg, Tcl_Obj *cmdName,
-		Tcl_Obj *methodPath, char *arglist) {
+		Tcl_Obj *methodPathObj, char *arglist) {
   int need_space = 0;
 
   assert(interp);
@@ -248,12 +248,12 @@
     need_space = 1;
   }
 
-  if (methodPath) {
+  if (methodPathObj) {
     if (need_space) Tcl_AppendResult(interp, " ", (char *) NULL);
 
-    INCR_REF_COUNT(methodPath);
-    Tcl_AppendResult(interp, ObjStr(methodPath), (char *) NULL);
-    DECR_REF_COUNT(methodPath);
+    INCR_REF_COUNT(methodPathObj);
+    Tcl_AppendResult(interp, ObjStr(methodPathObj), (char *) NULL);
+    DECR_REF_COUNT(methodPathObj);
 
     need_space = 1;
   }
@@ -283,15 +283,15 @@
  */
 int
 NsfArgumentError(Tcl_Interp *interp, CONST char *errorMsg, Nsf_Param CONST *paramPtr,
-              Tcl_Obj *cmdNameObj, Tcl_Obj *methodObj) {
+              Tcl_Obj *cmdNameObj, Tcl_Obj *methodPathObj) {
   Tcl_Obj *argStringObj = NsfParamDefsSyntax(interp, paramPtr, NULL, NULL);
 
   assert(interp);
   assert(errorMsg);
   assert(paramPtr);
 
   NsfObjWrongArgs(interp, errorMsg, cmdNameObj, 
-		  NsfMethodNamePath(interp, NULL /* use topmost frame */, NsfMethodName(methodObj)), 
+		  NsfMethodNamePath(interp, NULL /* use topmost frame */, NsfMethodName(methodPathObj)), 
 		  ObjStr(argStringObj));
   DECR_REF_COUNT2("paramDefsObj", argStringObj);
 
@@ -330,7 +330,7 @@
   Tcl_DStringAppend(dsPtr, "', maybe too many arguments;", -1);
   NsfArgumentError(interp, Tcl_DStringValue(dsPtr), paramPtr,
 		   object ? object->cmdName : NULL,
-		   procNameObj);
+		   NsfMethodNamePath(interp, NULL /* use topmost frame */, NsfMethodName(procNameObj)));
   DSTRING_FREE(dsPtr);
   return TCL_ERROR;
 }
@@ -382,7 +382,7 @@
 
   NsfArgumentError(interp, Tcl_DStringValue(dsPtr), paramPtr,
 		   object ? object->cmdName : NULL,
-		   procNameObj);
+		   NsfMethodNamePath(interp, NULL /* use topmost frame */, NsfMethodName(procNameObj)));
   DSTRING_FREE(dsPtr);
   return TCL_ERROR;
 }