Index: generic/nsf.c
===================================================================
diff -u -r77104533a2105611e79a6723ece344e0ae6dc016 -rfdab3b9e05d21cb92835b9128193c7ba329d583d
--- generic/nsf.c	(.../nsf.c)	(revision 77104533a2105611e79a6723ece344e0ae6dc016)
+++ generic/nsf.c	(.../nsf.c)	(revision fdab3b9e05d21cb92835b9128193c7ba329d583d)
@@ -15405,21 +15405,21 @@
 /*
 objectInfoMethod lookupmethods NsfObjInfoLookupMethodsMethod {
   {-argName "-callprotection" -nrargs 1 -type "all|protected|public" -default all}
-  {-argName "-expand"}
   {-argName "-incontext"}
   {-argName "-methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
   {-argName "-nomixins"}
+  {-argName "-path"}
   {-argName "-source" -nrargs 1 -type "all|application|baseclasses"}
   {-argName "pattern" -required 0}
 }
 */
 static int
 NsfObjInfoLookupMethodsMethod(Tcl_Interp *interp, NsfObject *object,
 			      int withCallprotection,
-			      int withExpand,
 			      int withIncontext,
 			      int withMethodtype,
 			      int withNomixins,
+			      int withPath,
 			      int withSource,
 			      CONST char *pattern) {
   NsfClasses *pl;
@@ -15445,7 +15445,7 @@
     cmdTablePtr = Tcl_Namespace_cmdTablePtr(object->nsPtr);
     if (MethodSourceMatches(interp, withSource, NULL, object)) {
       ListMethodKeys(interp, cmdTablePtr, NULL, pattern, methodType,
-		     withCallprotection, withExpand,
+		     withCallprotection, withPath,
 		     dups, object, withPer_object);
     }
   }
@@ -15469,7 +15469,7 @@
           Tcl_HashTable *cmdTablePtr = Tcl_Namespace_cmdTablePtr(mixin->nsPtr);
 	  if (!MethodSourceMatches(interp, withSource, mixin, NULL)) continue;
           ListMethodKeys(interp, cmdTablePtr, NULL, pattern, methodType,
-			 withCallprotection, withExpand,
+			 withCallprotection, withPath,
                          dups, object, withPer_object);
         }
       }
@@ -15481,7 +15481,7 @@
     Tcl_HashTable *cmdTablePtr = Tcl_Namespace_cmdTablePtr(pl->cl->nsPtr);
     if (!MethodSourceMatches(interp, withSource, pl->cl, NULL)) continue;
     ListMethodKeys(interp, cmdTablePtr, NULL, pattern, methodType,
-		   withCallprotection, withExpand,
+		   withCallprotection, withPath,
                    dups, object, withPer_object);
   }
   Tcl_DeleteHashTable(dups);
@@ -15541,21 +15541,25 @@
 
 /*
 objectInfoMethod methods NsfObjInfoMethodsMethod {
-  {-argName "-methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
   {-argName "-callprotection" -nrargs 1 -type "all|protected|public" -default public}
-  {-argName "-expand"}
-  {-argName "-nomixins"}
   {-argName "-incontext"}
+  {-argName "-methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
+  {-argName "-nomixins"}
+  {-argName "-path"}
   {-argName "pattern"}
 }
 */
 static int
 NsfObjInfoMethodsMethod(Tcl_Interp *interp, NsfObject *object,
-			int withMethodtype, int withCallproctection, int withExpand,
-			int withNomixins, int withIncontext, CONST char *pattern) {
+			int withCallproctection, 
+			int withIncontext, 
+			int withMethodtype, 
+			int withNomixins, 
+			int withPath,
+			CONST char *pattern) {
   return ListDefinedMethods(interp, object, pattern, 1 /* per-object */,
                             AggregatedMethodType(withMethodtype), withCallproctection,
-                            withExpand, withNomixins, withIncontext);
+                            withPath, withNomixins, withIncontext);
 }
 
 /*
@@ -15792,22 +15796,25 @@
 
 /*
 classInfoMethod methods NsfClassInfoMethodsMethod {
-  {-argName "-methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
   {-argName "-callprotection" -nrargs 1 -type "all|protected|public" -default public}
-  {-argName "-expand"}
-  {-argName "-nomixins"}
   {-argName "-incontext"}
+  {-argName "-methodtype" -nrargs 1 -type "all|scripted|builtin|alias|forwarder|object|setter"}
+  {-argName "-nomixins"}
+  {-argName "-path"}
   {-argName "pattern"}
 }
 */
 static int
 NsfClassInfoMethodsMethod(Tcl_Interp *interp, NsfClass *class,
-			  int withMethodtype, int withCallproctection,
-			  int withExpand, int withNomixins, int withIncontext,
+			  int withCallproctection, 
+			  int withIncontext, 
+			  int withMethodtype, 
+			  int withNomixins, 
+			  int withPath,
 			  CONST char *pattern) {
   return ListDefinedMethods(interp, &class->object, pattern, 0 /* per-object */,
                             AggregatedMethodType(withMethodtype), withCallproctection,
-			    withExpand, withNomixins, withIncontext);
+			    withPath, withNomixins, withIncontext);
 }
 
 /*