Index: generic/tclAPI.h
===================================================================
diff -u -r915842c26db98121eb7ed1c6adfbe499ce586cac -r75bdefce85cff349831dbca1900153fca956574c
--- generic/tclAPI.h	(.../tclAPI.h)	(revision 915842c26db98121eb7ed1c6adfbe499ce586cac)
+++ generic/tclAPI.h	(.../tclAPI.h)	(revision 75bdefce85cff349831dbca1900153fca956574c)
@@ -101,13 +101,13 @@
 static int convertToObjectkind(Tcl_Interp *interp, Tcl_Obj *objPtr, XOTclParam CONST *pPtr, 
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
-  static CONST char *opts[] = {"type", "object", "class", "baseclass", "metaclass", "hasmixin", NULL};
+  static CONST char *opts[] = {"type", "object", "class", "baseclass", "metaclass", NULL};
   result = Tcl_GetIndexFromObj(interp, objPtr, opts, "objectkind", 0, &index);
   *clientData = (ClientData) INT2PTR(index + 1);
   *outObjPtr = objPtr;
   return result;
 }
-enum ObjectkindIdx {ObjectkindNULL, ObjectkindTypeIdx, ObjectkindObjectIdx, ObjectkindClassIdx, ObjectkindBaseclassIdx, ObjectkindMetaclassIdx, ObjectkindHasmixinIdx};
+enum ObjectkindIdx {ObjectkindNULL, ObjectkindTypeIdx, ObjectkindObjectIdx, ObjectkindClassIdx, ObjectkindBaseclassIdx, ObjectkindMetaclassIdx};
   
 static int convertToRelationtype(Tcl_Interp *interp, Tcl_Obj *objPtr, XOTclParam CONST *pPtr, 
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
@@ -292,7 +292,7 @@
 static int XOTclImportvarCmd(Tcl_Interp *interp, XOTclObject *object, int nobjc, Tcl_Obj *CONST nobjv[]);
 static int XOTclInterpObjCmd(Tcl_Interp *interp, CONST char *name, int objc, Tcl_Obj *CONST objv[]);
 static int XOTclInvalidateObjectParameterCmd(Tcl_Interp *interp, XOTclClass *class);
-static int XOTclIsCmd(Tcl_Interp *interp, Tcl_Obj *value, Tcl_Obj *constraint, Tcl_Obj *withHasmixin, Tcl_Obj *withType, Tcl_Obj *arg);
+static int XOTclIsCmd(Tcl_Interp *interp, Tcl_Obj *value, Tcl_Obj *constraint, Tcl_Obj *withType, Tcl_Obj *arg);
 static int XOTclMethodCmd(Tcl_Interp *interp, XOTclObject *object, int withInner_namespace, int withPer_object, int withPublic, Tcl_Obj *name, Tcl_Obj *args, Tcl_Obj *body, Tcl_Obj *withPrecondition, Tcl_Obj *withPostcondition);
 static int XOTclMethodPropertyCmd(Tcl_Interp *interp, XOTclObject *object, int withPer_object, Tcl_Obj *methodName, int methodproperty, Tcl_Obj *value);
 static int XOTclMyCmd(Tcl_Interp *interp, int withLocal, Tcl_Obj *method, int nobjc, Tcl_Obj *CONST nobjv[]);
@@ -1716,12 +1716,11 @@
   } else {
     Tcl_Obj *value = (Tcl_Obj *)pc.clientData[0];
     Tcl_Obj *constraint = (Tcl_Obj *)pc.clientData[1];
-    Tcl_Obj *withHasmixin = (Tcl_Obj *)pc.clientData[2];
-    Tcl_Obj *withType = (Tcl_Obj *)pc.clientData[3];
-    Tcl_Obj *arg = (Tcl_Obj *)pc.clientData[4];
+    Tcl_Obj *withType = (Tcl_Obj *)pc.clientData[2];
+    Tcl_Obj *arg = (Tcl_Obj *)pc.clientData[3];
 
     parseContextRelease(&pc);
-    return XOTclIsCmd(interp, value, constraint, withHasmixin, withType, arg);
+    return XOTclIsCmd(interp, value, constraint, withType, arg);
 
   }
 }
@@ -2216,10 +2215,9 @@
 {"::nsf::invalidateobjectparameter", XOTclInvalidateObjectParameterCmdStub, 1, {
   {"class", 0, 0, convertToClass}}
 },
-{"::nsf::is", XOTclIsCmdStub, 5, {
+{"::nsf::is", XOTclIsCmdStub, 4, {
   {"value", 1, 0, convertToTclobj},
   {"constraint", 1, 0, convertToTclobj},
-  {"-hasmixin", 0, 1, convertToTclobj},
   {"-type", 0, 1, convertToTclobj},
   {"arg", 0, 0, convertToTclobj}}
 },