Index: generic/xotclDecls.h
===================================================================
diff -u -rc72f9f638677608fab1502cd696c8f2d6b2952f9 -r46f02e4868e118466d888b35d6b281b3f2ba31ac
--- generic/xotclDecls.h	(.../xotclDecls.h)	(revision c72f9f638677608fab1502cd696c8f2d6b2952f9)
+++ generic/xotclDecls.h	(.../xotclDecls.h)	(revision 46f02e4868e118466d888b35d6b281b3f2ba31ac)
@@ -29,124 +29,150 @@
 EXTERN int		Xotcl_Init _ANSI_ARGS_((Tcl_Interp * interp));
 /* Slot 1 is reserved */
 /* 2 */
-EXTERN struct XOTcl_Class* XOTclIsClass _ANSI_ARGS_((Tcl_Interp* in, 
+EXTERN struct XOTcl_Class * XOTclIsClass _ANSI_ARGS_((Tcl_Interp * interp, 
 				ClientData cd));
 /* Slot 3 is reserved */
 /* 4 */
-EXTERN struct XOTcl_Object* XOTclGetObject _ANSI_ARGS_((Tcl_Interp* in, 
-				char* name));
+EXTERN struct XOTcl_Object * XOTclGetObject _ANSI_ARGS_((Tcl_Interp * interp, 
+				char * name));
 /* 5 */
-EXTERN struct XOTcl_Class* XOTclGetClass _ANSI_ARGS_((Tcl_Interp* in, 
-				char* name));
+EXTERN struct XOTcl_Class * XOTclGetClass _ANSI_ARGS_((Tcl_Interp * interp, 
+				char * name));
 /* 6 */
-EXTERN int		XOTclCreateObject _ANSI_ARGS_((Tcl_Interp* in, 
-				Tcl_Obj* name, struct XOTcl_Class* cl));
+EXTERN int		XOTclCreateObject _ANSI_ARGS_((Tcl_Interp * interp, 
+				Tcl_Obj * name, struct XOTcl_Class * cl));
 /* Slot 7 is reserved */
 /* 8 */
-EXTERN int		XOTclCreateClass _ANSI_ARGS_((Tcl_Interp* in, 
-				Tcl_Obj* name, struct XOTcl_Class* cl));
+EXTERN int		XOTclCreateClass _ANSI_ARGS_((Tcl_Interp * interp, 
+				Tcl_Obj * name, struct XOTcl_Class * cl));
 /* 9 */
-EXTERN int		XOTclDeleteObject _ANSI_ARGS_((Tcl_Interp* in, 
-				struct XOTcl_Object* obj));
+EXTERN int		XOTclDeleteObject _ANSI_ARGS_((Tcl_Interp * interp, 
+				struct XOTcl_Object * obj));
 /* 10 */
-EXTERN int		XOTclDeleteClass _ANSI_ARGS_((Tcl_Interp* in, 
-				struct XOTcl_Class* cl));
+EXTERN int		XOTclDeleteClass _ANSI_ARGS_((Tcl_Interp * interp, 
+				struct XOTcl_Class * cl));
 /* 11 */
-EXTERN void		XOTclAddPMethod _ANSI_ARGS_((Tcl_Interp* in, 
-				struct XOTcl_Object* obj, char* nm, 
-				Tcl_ObjCmdProc* proc, ClientData cd, 
-				Tcl_CmdDeleteProc* dp));
+EXTERN Tcl_Command	XOTclAddPMethod _ANSI_ARGS_((Tcl_Interp * interp, 
+				struct XOTcl_Object * obj, char * nm, 
+				Tcl_ObjCmdProc * proc, ClientData cd, 
+				Tcl_CmdDeleteProc * dp));
 /* 12 */
-EXTERN void		XOTclAddIMethod _ANSI_ARGS_((Tcl_Interp* in, 
-				struct XOTcl_Class* cl, char* nm, 
-				Tcl_ObjCmdProc* proc, ClientData cd, 
-				Tcl_CmdDeleteProc* dp));
+EXTERN Tcl_Command	XOTclAddIMethod _ANSI_ARGS_((Tcl_Interp * interp, 
+				struct XOTcl_Class * cl, char * nm, 
+				Tcl_ObjCmdProc * proc, ClientData cd, 
+				Tcl_CmdDeleteProc * dp));
 /* 13 */
-EXTERN void		XOTclRemovePMethod _ANSI_ARGS_((Tcl_Interp* in, 
-				struct XOTcl_Object* obj, char* nm));
+EXTERN void		XOTclRemovePMethod _ANSI_ARGS_((Tcl_Interp * interp, 
+				struct XOTcl_Object * obj, char * nm));
 /* 14 */
-EXTERN void		XOTclRemoveIMethod _ANSI_ARGS_((Tcl_Interp* in, 
-				struct XOTcl_Class* cl, char* nm));
+EXTERN void		XOTclRemoveIMethod _ANSI_ARGS_((Tcl_Interp * interp, 
+				struct XOTcl_Class * cl, char * nm));
 /* 15 */
-EXTERN Tcl_Obj*		XOTclOSetInstVar _ANSI_ARGS_((
-				struct XOTcl_Object* obj, Tcl_Interp* in, 
-				Tcl_Obj* name, Tcl_Obj* value, int flgs));
+EXTERN Tcl_Obj *	XOTclOSetInstVar _ANSI_ARGS_((
+				struct XOTcl_Object * obj, 
+				Tcl_Interp * interp, Tcl_Obj * name, 
+				Tcl_Obj * value, int flgs));
 /* 16 */
-EXTERN Tcl_Obj*		XOTclOGetInstVar _ANSI_ARGS_((
-				struct XOTcl_Object* obj, Tcl_Interp* in, 
-				Tcl_Obj* name, int flgs));
+EXTERN Tcl_Obj *	XOTclOGetInstVar _ANSI_ARGS_((
+				struct XOTcl_Object * obj, 
+				Tcl_Interp * interp, Tcl_Obj * name, 
+				int flgs));
 /* 17 */
-EXTERN int		XOTclInstVar _ANSI_ARGS_((struct XOTcl_Object* obj, 
-				Tcl_Interp* in, char* name, char* destName));
+EXTERN int		XOTclInstVar _ANSI_ARGS_((struct XOTcl_Object * obj, 
+				Tcl_Interp * interp, char * name, 
+				char * destName));
 /* Slot 18 is reserved */
 /* 19 */
-EXTERN Tcl_Obj*		XOTclOSetInstVar2 _ANSI_ARGS_((
-				struct XOTcl_Object* obj, Tcl_Interp* in, 
-				Tcl_Obj* name1, Tcl_Obj* name2, 
-				Tcl_Obj* value, int flgs));
+EXTERN Tcl_Obj *	XOTcl_ObjSetVar2 _ANSI_ARGS_((
+				struct XOTcl_Object * obj, 
+				Tcl_Interp * interp, Tcl_Obj * name1, 
+				Tcl_Obj * name2, Tcl_Obj * value, int flgs));
 /* 20 */
-EXTERN Tcl_Obj*		XOTclOGetInstVar2 _ANSI_ARGS_((
-				struct XOTcl_Object* obj, Tcl_Interp* in, 
-				Tcl_Obj* name1, Tcl_Obj* name2, int flgs));
+EXTERN Tcl_Obj *	XOTcl_ObjGetVar2 _ANSI_ARGS_((
+				struct XOTcl_Object * obj, 
+				Tcl_Interp * interp, Tcl_Obj * name1, 
+				Tcl_Obj * name2, int flgs));
 /* 21 */
 EXTERN int		XOTclUnsetInstVar2 _ANSI_ARGS_((
-				struct XOTcl_Object* obj, Tcl_Interp* in, 
-				char* name1, char* name2, int flgs));
+				struct XOTcl_Object * obj, 
+				Tcl_Interp * interp, char * name1, 
+				char * name2, int flgs));
 /* 22 */
 EXTERN int		XOTcl_TraceObjCmd _ANSI_ARGS_((ClientData cd, 
-				Tcl_Interp * in, int objc, 
+				Tcl_Interp * interp, int objc, 
 				Tcl_Obj *CONST objv[]));
 /* 23 */
-EXTERN int		XOTclErrMsg _ANSI_ARGS_((Tcl_Interp* in, char* msg, 
-				Tcl_FreeProc* type));
+EXTERN int		XOTclErrMsg _ANSI_ARGS_((Tcl_Interp * interp, 
+				char * msg, Tcl_FreeProc * type));
 /* 24 */
-EXTERN int		XOTclVarErrMsg _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,in));
+EXTERN int		XOTclVarErrMsg _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp));
 /* 25 */
-EXTERN int		XOTclErrInProc _ANSI_ARGS_((Tcl_Interp * in, 
-				Tcl_Obj* objName, Tcl_Obj* clName, 
-				char* procName));
-/* 26 */
-EXTERN int		XOTclObjErrArgCnt _ANSI_ARGS_((Tcl_Interp * in, 
-				Tcl_Obj * cmdname, char * arglist));
+EXTERN int		XOTclErrInProc _ANSI_ARGS_((Tcl_Interp * interp, 
+				Tcl_Obj * objName, Tcl_Obj * clName, 
+				char * procName));
+/* Slot 26 is reserved */
 /* 27 */
-EXTERN int		XOTclErrBadVal_ _ANSI_ARGS_((Tcl_Interp * in, 
+EXTERN int		XOTclErrBadVal_ _ANSI_ARGS_((Tcl_Interp * interp, 
 				char * expected, char * value));
 /* 28 */
-EXTERN int		XOTclObjErrType _ANSI_ARGS_((Tcl_Interp * in, 
-				Tcl_Obj * nm, char* wt));
+EXTERN int		XOTclObjErrType _ANSI_ARGS_((Tcl_Interp * interp, 
+				Tcl_Obj * nm, char * wt));
 /* 29 */
-EXTERN void		XOTclStackDump _ANSI_ARGS_((Tcl_Interp* in));
+EXTERN void		XOTclStackDump _ANSI_ARGS_((Tcl_Interp * interp));
 /* 30 */
-EXTERN void		XOTclCallStackDump _ANSI_ARGS_((Tcl_Interp* in));
+EXTERN void		XOTclCallStackDump _ANSI_ARGS_((Tcl_Interp * interp));
 /* 31 */
-EXTERN void		XOTclDeprecatedMsg _ANSI_ARGS_((char* oldCmd, 
-				char* newCmd));
+EXTERN void		XOTclDeprecatedMsg _ANSI_ARGS_((char * oldCmd, 
+				char * newCmd));
 /* 32 */
-EXTERN void		XOTclSetObjClientData _ANSI_ARGS_((XOTcl_Object* obj, 
-				ClientData data));
+EXTERN void		XOTclSetObjClientData _ANSI_ARGS_((
+				XOTcl_Object * obj, ClientData data));
 /* 33 */
-EXTERN ClientData	XOTclGetObjClientData _ANSI_ARGS_((XOTcl_Object* obj));
+EXTERN ClientData	XOTclGetObjClientData _ANSI_ARGS_((
+				XOTcl_Object * obj));
 /* 34 */
-EXTERN void		XOTclSetClassClientData _ANSI_ARGS_((XOTcl_Class* cl, 
-				ClientData data));
+EXTERN void		XOTclSetClassClientData _ANSI_ARGS_((
+				XOTcl_Class * cl, ClientData data));
 /* 35 */
-EXTERN ClientData	XOTclGetClassClientData _ANSI_ARGS_((XOTcl_Class* cl));
+EXTERN ClientData	XOTclGetClassClientData _ANSI_ARGS_((
+				XOTcl_Class * cl));
 /* 36 */
-EXTERN void		XOTclRequireObjNamespace _ANSI_ARGS_((Tcl_Interp* in, 
-				XOTcl_Object* obj));
+EXTERN void		XOTclRequireObjNamespace _ANSI_ARGS_((
+				Tcl_Interp * interp, XOTcl_Object * obj));
 /* 37 */
-EXTERN int		XOTclErrBadVal _ANSI_ARGS_((Tcl_Interp * in, 
+EXTERN int		XOTclErrBadVal _ANSI_ARGS_((Tcl_Interp * interp, 
 				char * context, char * expected, 
 				char * value));
 /* 38 */
 EXTERN int		XOTclNextObjCmd _ANSI_ARGS_((ClientData cd, 
-				Tcl_Interp * in, int objc, 
+				Tcl_Interp * interp, int objc, 
 				Tcl_Obj *CONST objv[]));
 /* 39 */
 EXTERN int		XOTclCallMethodWithArgs _ANSI_ARGS_((ClientData cd, 
-				Tcl_Interp * in, Tcl_Obj * method, 
+				Tcl_Interp * interp, Tcl_Obj * method, 
 				Tcl_Obj * arg, int objc, 
 				Tcl_Obj *CONST objv[], int flags));
+/* 40 */
+EXTERN int		XOTclObjErrArgCnt _ANSI_ARGS_((Tcl_Interp * interp, 
+				Tcl_Obj * cmdName, Tcl_Obj * methodName, 
+				char * arglist));
+/* 41 */
+EXTERN Tcl_Command	XOTclAddObjectMethod _ANSI_ARGS_((
+				Tcl_Interp * interp, 
+				struct XOTcl_Object * obj, char * nm, 
+				Tcl_ObjCmdProc * proc, ClientData cd, 
+				Tcl_CmdDeleteProc * dp, int flags));
+/* 42 */
+EXTERN Tcl_Command	XOTclAddInstanceMethod _ANSI_ARGS_((
+				Tcl_Interp * interp, struct XOTcl_Class * cl, 
+				char * nm, Tcl_ObjCmdProc * proc, 
+				ClientData cd, Tcl_CmdDeleteProc * dp, 
+				int flags));
+/* 43 */
+EXTERN int		XOTclCreate _ANSI_ARGS_((Tcl_Interp * in, 
+				XOTcl_Class * class, Tcl_Obj * name, 
+				ClientData data, int objc, 
+				Tcl_Obj *CONST objv[]));
 
 typedef struct XotclStubHooks {
     struct XotclIntStubs *xotclIntStubs;
@@ -158,44 +184,48 @@
 
     int (*xotcl_Init) _ANSI_ARGS_((Tcl_Interp * interp)); /* 0 */
     void *reserved1;
-    struct XOTcl_Class* (*xOTclIsClass) _ANSI_ARGS_((Tcl_Interp* in, ClientData cd)); /* 2 */
+    struct XOTcl_Class * (*xOTclIsClass) _ANSI_ARGS_((Tcl_Interp * interp, ClientData cd)); /* 2 */
     void *reserved3;
-    struct XOTcl_Object* (*xOTclGetObject) _ANSI_ARGS_((Tcl_Interp* in, char* name)); /* 4 */
-    struct XOTcl_Class* (*xOTclGetClass) _ANSI_ARGS_((Tcl_Interp* in, char* name)); /* 5 */
-    int (*xOTclCreateObject) _ANSI_ARGS_((Tcl_Interp* in, Tcl_Obj* name, struct XOTcl_Class* cl)); /* 6 */
+    struct XOTcl_Object * (*xOTclGetObject) _ANSI_ARGS_((Tcl_Interp * interp, char * name)); /* 4 */
+    struct XOTcl_Class * (*xOTclGetClass) _ANSI_ARGS_((Tcl_Interp * interp, char * name)); /* 5 */
+    int (*xOTclCreateObject) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * name, struct XOTcl_Class * cl)); /* 6 */
     void *reserved7;
-    int (*xOTclCreateClass) _ANSI_ARGS_((Tcl_Interp* in, Tcl_Obj* name, struct XOTcl_Class* cl)); /* 8 */
-    int (*xOTclDeleteObject) _ANSI_ARGS_((Tcl_Interp* in, struct XOTcl_Object* obj)); /* 9 */
-    int (*xOTclDeleteClass) _ANSI_ARGS_((Tcl_Interp* in, struct XOTcl_Class* cl)); /* 10 */
-    void (*xOTclAddPMethod) _ANSI_ARGS_((Tcl_Interp* in, struct XOTcl_Object* obj, char* nm, Tcl_ObjCmdProc* proc, ClientData cd, Tcl_CmdDeleteProc* dp)); /* 11 */
-    void (*xOTclAddIMethod) _ANSI_ARGS_((Tcl_Interp* in, struct XOTcl_Class* cl, char* nm, Tcl_ObjCmdProc* proc, ClientData cd, Tcl_CmdDeleteProc* dp)); /* 12 */
-    void (*xOTclRemovePMethod) _ANSI_ARGS_((Tcl_Interp* in, struct XOTcl_Object* obj, char* nm)); /* 13 */
-    void (*xOTclRemoveIMethod) _ANSI_ARGS_((Tcl_Interp* in, struct XOTcl_Class* cl, char* nm)); /* 14 */
-    Tcl_Obj* (*xOTclOSetInstVar) _ANSI_ARGS_((struct XOTcl_Object* obj, Tcl_Interp* in, Tcl_Obj* name, Tcl_Obj* value, int flgs)); /* 15 */
-    Tcl_Obj* (*xOTclOGetInstVar) _ANSI_ARGS_((struct XOTcl_Object* obj, Tcl_Interp* in, Tcl_Obj* name, int flgs)); /* 16 */
-    int (*xOTclInstVar) _ANSI_ARGS_((struct XOTcl_Object* obj, Tcl_Interp* in, char* name, char* destName)); /* 17 */
+    int (*xOTclCreateClass) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * name, struct XOTcl_Class * cl)); /* 8 */
+    int (*xOTclDeleteObject) _ANSI_ARGS_((Tcl_Interp * interp, struct XOTcl_Object * obj)); /* 9 */
+    int (*xOTclDeleteClass) _ANSI_ARGS_((Tcl_Interp * interp, struct XOTcl_Class * cl)); /* 10 */
+    Tcl_Command (*xOTclAddPMethod) _ANSI_ARGS_((Tcl_Interp * interp, struct XOTcl_Object * obj, char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp)); /* 11 */
+    Tcl_Command (*xOTclAddIMethod) _ANSI_ARGS_((Tcl_Interp * interp, struct XOTcl_Class * cl, char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp)); /* 12 */
+    void (*xOTclRemovePMethod) _ANSI_ARGS_((Tcl_Interp * interp, struct XOTcl_Object * obj, char * nm)); /* 13 */
+    void (*xOTclRemoveIMethod) _ANSI_ARGS_((Tcl_Interp * interp, struct XOTcl_Class * cl, char * nm)); /* 14 */
+    Tcl_Obj * (*xOTclOSetInstVar) _ANSI_ARGS_((struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name, Tcl_Obj * value, int flgs)); /* 15 */
+    Tcl_Obj * (*xOTclOGetInstVar) _ANSI_ARGS_((struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name, int flgs)); /* 16 */
+    int (*xOTclInstVar) _ANSI_ARGS_((struct XOTcl_Object * obj, Tcl_Interp * interp, char * name, char * destName)); /* 17 */
     void *reserved18;
-    Tcl_Obj* (*xOTclOSetInstVar2) _ANSI_ARGS_((struct XOTcl_Object* obj, Tcl_Interp* in, Tcl_Obj* name1, Tcl_Obj* name2, Tcl_Obj* value, int flgs)); /* 19 */
-    Tcl_Obj* (*xOTclOGetInstVar2) _ANSI_ARGS_((struct XOTcl_Object* obj, Tcl_Interp* in, Tcl_Obj* name1, Tcl_Obj* name2, int flgs)); /* 20 */
-    int (*xOTclUnsetInstVar2) _ANSI_ARGS_((struct XOTcl_Object* obj, Tcl_Interp* in, char* name1, char* name2, int flgs)); /* 21 */
-    int (*xOTcl_TraceObjCmd) _ANSI_ARGS_((ClientData cd, Tcl_Interp * in, int objc, Tcl_Obj *CONST objv[])); /* 22 */
-    int (*xOTclErrMsg) _ANSI_ARGS_((Tcl_Interp* in, char* msg, Tcl_FreeProc* type)); /* 23 */
-    int (*xOTclVarErrMsg) _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,in)); /* 24 */
-    int (*xOTclErrInProc) _ANSI_ARGS_((Tcl_Interp * in, Tcl_Obj* objName, Tcl_Obj* clName, char* procName)); /* 25 */
-    int (*xOTclObjErrArgCnt) _ANSI_ARGS_((Tcl_Interp * in, Tcl_Obj * cmdname, char * arglist)); /* 26 */
-    int (*xOTclErrBadVal_) _ANSI_ARGS_((Tcl_Interp * in, char * expected, char * value)); /* 27 */
-    int (*xOTclObjErrType) _ANSI_ARGS_((Tcl_Interp * in, Tcl_Obj * nm, char* wt)); /* 28 */
-    void (*xOTclStackDump) _ANSI_ARGS_((Tcl_Interp* in)); /* 29 */
-    void (*xOTclCallStackDump) _ANSI_ARGS_((Tcl_Interp* in)); /* 30 */
-    void (*xOTclDeprecatedMsg) _ANSI_ARGS_((char* oldCmd, char* newCmd)); /* 31 */
-    void (*xOTclSetObjClientData) _ANSI_ARGS_((XOTcl_Object* obj, ClientData data)); /* 32 */
-    ClientData (*xOTclGetObjClientData) _ANSI_ARGS_((XOTcl_Object* obj)); /* 33 */
-    void (*xOTclSetClassClientData) _ANSI_ARGS_((XOTcl_Class* cl, ClientData data)); /* 34 */
-    ClientData (*xOTclGetClassClientData) _ANSI_ARGS_((XOTcl_Class* cl)); /* 35 */
-    void (*xOTclRequireObjNamespace) _ANSI_ARGS_((Tcl_Interp* in, XOTcl_Object* obj)); /* 36 */
-    int (*xOTclErrBadVal) _ANSI_ARGS_((Tcl_Interp * in, char * context, char * expected, char * value)); /* 37 */
-    int (*xOTclNextObjCmd) _ANSI_ARGS_((ClientData cd, Tcl_Interp * in, int objc, Tcl_Obj *CONST objv[])); /* 38 */
-    int (*xOTclCallMethodWithArgs) _ANSI_ARGS_((ClientData cd, Tcl_Interp * in, Tcl_Obj * method, Tcl_Obj * arg, int objc, Tcl_Obj *CONST objv[], int flags)); /* 39 */
+    Tcl_Obj * (*xOTcl_ObjSetVar2) _ANSI_ARGS_((struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, Tcl_Obj * value, int flgs)); /* 19 */
+    Tcl_Obj * (*xOTcl_ObjGetVar2) _ANSI_ARGS_((struct XOTcl_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, int flgs)); /* 20 */
+    int (*xOTclUnsetInstVar2) _ANSI_ARGS_((struct XOTcl_Object * obj, Tcl_Interp * interp, char * name1, char * name2, int flgs)); /* 21 */
+    int (*xOTcl_TraceObjCmd) _ANSI_ARGS_((ClientData cd, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 22 */
+    int (*xOTclErrMsg) _ANSI_ARGS_((Tcl_Interp * interp, char * msg, Tcl_FreeProc * type)); /* 23 */
+    int (*xOTclVarErrMsg) _ANSI_ARGS_(TCL_VARARGS(Tcl_Interp *,interp)); /* 24 */
+    int (*xOTclErrInProc) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * objName, Tcl_Obj * clName, char * procName)); /* 25 */
+    void *reserved26;
+    int (*xOTclErrBadVal_) _ANSI_ARGS_((Tcl_Interp * interp, char * expected, char * value)); /* 27 */
+    int (*xOTclObjErrType) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * nm, char * wt)); /* 28 */
+    void (*xOTclStackDump) _ANSI_ARGS_((Tcl_Interp * interp)); /* 29 */
+    void (*xOTclCallStackDump) _ANSI_ARGS_((Tcl_Interp * interp)); /* 30 */
+    void (*xOTclDeprecatedMsg) _ANSI_ARGS_((char * oldCmd, char * newCmd)); /* 31 */
+    void (*xOTclSetObjClientData) _ANSI_ARGS_((XOTcl_Object * obj, ClientData data)); /* 32 */
+    ClientData (*xOTclGetObjClientData) _ANSI_ARGS_((XOTcl_Object * obj)); /* 33 */
+    void (*xOTclSetClassClientData) _ANSI_ARGS_((XOTcl_Class * cl, ClientData data)); /* 34 */
+    ClientData (*xOTclGetClassClientData) _ANSI_ARGS_((XOTcl_Class * cl)); /* 35 */
+    void (*xOTclRequireObjNamespace) _ANSI_ARGS_((Tcl_Interp * interp, XOTcl_Object * obj)); /* 36 */
+    int (*xOTclErrBadVal) _ANSI_ARGS_((Tcl_Interp * interp, char * context, char * expected, char * value)); /* 37 */
+    int (*xOTclNextObjCmd) _ANSI_ARGS_((ClientData cd, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[])); /* 38 */
+    int (*xOTclCallMethodWithArgs) _ANSI_ARGS_((ClientData cd, Tcl_Interp * interp, Tcl_Obj * method, Tcl_Obj * arg, int objc, Tcl_Obj *CONST objv[], int flags)); /* 39 */
+    int (*xOTclObjErrArgCnt) _ANSI_ARGS_((Tcl_Interp * interp, Tcl_Obj * cmdName, Tcl_Obj * methodName, char * arglist)); /* 40 */
+    Tcl_Command (*xOTclAddObjectMethod) _ANSI_ARGS_((Tcl_Interp * interp, struct XOTcl_Object * obj, char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags)); /* 41 */
+    Tcl_Command (*xOTclAddInstanceMethod) _ANSI_ARGS_((Tcl_Interp * interp, struct XOTcl_Class * cl, char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags)); /* 42 */
+    int (*xOTclCreate) _ANSI_ARGS_((Tcl_Interp * in, XOTcl_Class * class, Tcl_Obj * name, ClientData data, int objc, Tcl_Obj *CONST objv[])); /* 43 */
 } XotclStubs;
 
 #ifdef __cplusplus
@@ -276,13 +306,13 @@
 	(xotclStubsPtr->xOTclInstVar) /* 17 */
 #endif
 /* Slot 18 is reserved */
-#ifndef XOTclOSetInstVar2
-#define XOTclOSetInstVar2 \
-	(xotclStubsPtr->xOTclOSetInstVar2) /* 19 */
+#ifndef XOTcl_ObjSetVar2
+#define XOTcl_ObjSetVar2 \
+	(xotclStubsPtr->xOTcl_ObjSetVar2) /* 19 */
 #endif
-#ifndef XOTclOGetInstVar2
-#define XOTclOGetInstVar2 \
-	(xotclStubsPtr->xOTclOGetInstVar2) /* 20 */
+#ifndef XOTcl_ObjGetVar2
+#define XOTcl_ObjGetVar2 \
+	(xotclStubsPtr->xOTcl_ObjGetVar2) /* 20 */
 #endif
 #ifndef XOTclUnsetInstVar2
 #define XOTclUnsetInstVar2 \
@@ -304,10 +334,7 @@
 #define XOTclErrInProc \
 	(xotclStubsPtr->xOTclErrInProc) /* 25 */
 #endif
-#ifndef XOTclObjErrArgCnt
-#define XOTclObjErrArgCnt \
-	(xotclStubsPtr->xOTclObjErrArgCnt) /* 26 */
-#endif
+/* Slot 26 is reserved */
 #ifndef XOTclErrBadVal_
 #define XOTclErrBadVal_ \
 	(xotclStubsPtr->xOTclErrBadVal_) /* 27 */
@@ -360,6 +387,22 @@
 #define XOTclCallMethodWithArgs \
 	(xotclStubsPtr->xOTclCallMethodWithArgs) /* 39 */
 #endif
+#ifndef XOTclObjErrArgCnt
+#define XOTclObjErrArgCnt \
+	(xotclStubsPtr->xOTclObjErrArgCnt) /* 40 */
+#endif
+#ifndef XOTclAddObjectMethod
+#define XOTclAddObjectMethod \
+	(xotclStubsPtr->xOTclAddObjectMethod) /* 41 */
+#endif
+#ifndef XOTclAddInstanceMethod
+#define XOTclAddInstanceMethod \
+	(xotclStubsPtr->xOTclAddInstanceMethod) /* 42 */
+#endif
+#ifndef XOTclCreate
+#define XOTclCreate \
+	(xotclStubsPtr->xOTclCreate) /* 43 */
+#endif
 
 #endif /* defined(USE_XOTCL_STUBS) && !defined(USE_XOTCL_STUB_PROCS) */