Index: generic/xotcl.c
===================================================================
diff -u -re548a952433b4d26794f535995c9ed1ababe8807 -rd8d920f2976691dcf8e2a68b336eb253385030f6
--- generic/xotcl.c	(.../xotcl.c)	(revision e548a952433b4d26794f535995c9ed1ababe8807)
+++ generic/xotcl.c	(.../xotcl.c)	(revision d8d920f2976691dcf8e2a68b336eb253385030f6)
@@ -1046,8 +1046,8 @@
   if (object->flags & XOTCL_MIXIN_ORDER_DEFINED_AND_VALID) {
     XOTclCmdList *mixinList;
     for (mixinList = object->mixinOrder; mixinList; mixinList = mixinList->nextPtr) {
-      XOTclClass *mcl = XOTclpGetClass(interp, (char *)Tcl_GetCommandName(interp, mixinList->cmdPtr));
-      if (mcl && (*pcl = SearchCMethod(mcl, name, &cmd))) {
+      XOTclClass *mixin = XOTclGetClassFromCmdPtr(mixinList->cmdPtr);
+      if (mixin && (*pcl = SearchCMethod(mixin, name, &cmd))) {
         break;
       }
     }
@@ -13896,7 +13896,7 @@
 /*
 infoObjectMethod method XOTclObjInfoMethodMethod {
   {-argName "object" -type object}
-  {-argName "infomethodsubcmd" -type "args|definition|filter|handle|parameter|parametersyntax|type|precondition|postcondition"}
+  {-argName "infomethodsubcmd" -type "args|definition|handle|parameter|parametersyntax|type|precondition|postcondition"}
   {-argName "name"}
 }
 */
@@ -13905,10 +13905,7 @@
   Tcl_Namespace *nsPtr = object->nsPtr;
   Tcl_Command cmd;
 
-  if (subcmd == InfomethodsubcmdFilterIdx) {
-    return FilterSearchMethod(interp, object, methodName);
-
-  } else if (*methodName == ':') {
+  if (*methodName == ':') {
     Tcl_Obj *methodObj = Tcl_NewStringObj(methodName, -1);
     cmd = Tcl_GetCommandFromObj(interp, methodObj);
   } else {
@@ -14153,7 +14150,7 @@
 /*
 infoClassMethod method XOTclClassInfoMethodMethod {
   {-argName "class" -type class}
-  {-argName "infomethodsubcmd" -type "args|body|definition|filter|name|parameter|type|precondition|postcondition"}
+  {-argName "infomethodsubcmd" -type "args|body|definition|handle|parameter|type|precondition|postcondition"}
   {-argName "name"}
 }
 */
@@ -14162,9 +14159,7 @@
   Tcl_Namespace *nsPtr = class->nsPtr;
   Tcl_Command cmd;
 
-  if (subcmd == InfomethodsubcmdFilterIdx) {
-    return FilterSearchMethod(interp, &class->object, methodName);
-  } else if (*methodName == ':') {
+  if (*methodName == ':') {
     Tcl_Obj *methodObj = Tcl_NewStringObj(methodName, -1);
     cmd = Tcl_GetCommandFromObj(interp, methodObj);
   } else {