Index: generic/nsfDecls.h
===================================================================
diff -u -rdd7a26337aa9aec3e0a06d2137ee7e708a8e1a9a -r9be296c7be8b0c04eaedd9f96c36d626aa7c2c97
--- generic/nsfDecls.h	(.../nsfDecls.h)	(revision dd7a26337aa9aec3e0a06d2137ee7e708a8e1a9a)
+++ generic/nsfDecls.h	(.../nsfDecls.h)	(revision 9be296c7be8b0c04eaedd9f96c36d626aa7c2c97)
@@ -48,157 +48,131 @@
 EXTERN struct Nsf_Class * NsfGetClass (Tcl_Interp * interp, 
 				CONST char * name);
 #endif
-#ifndef NsfCreateObject_TCL_DECLARED
-#define NsfCreateObject_TCL_DECLARED
-/* 5 */
-EXTERN int		NsfCreateObject (Tcl_Interp * interp, Tcl_Obj * name, 
-				struct Nsf_Class * cl);
-#endif
 #ifndef NsfDeleteObject_TCL_DECLARED
 #define NsfDeleteObject_TCL_DECLARED
-/* 6 */
+/* 5 */
 EXTERN int		NsfDeleteObject (Tcl_Interp * interp, 
 				struct Nsf_Object * obj);
 #endif
 #ifndef NsfRemoveObjectMethod_TCL_DECLARED
 #define NsfRemoveObjectMethod_TCL_DECLARED
-/* 7 */
+/* 6 */
 EXTERN int		NsfRemoveObjectMethod (Tcl_Interp * interp, 
 				struct Nsf_Object * obj, CONST char * nm);
 #endif
 #ifndef NsfRemoveClassMethod_TCL_DECLARED
 #define NsfRemoveClassMethod_TCL_DECLARED
-/* 8 */
+/* 7 */
 EXTERN int		NsfRemoveClassMethod (Tcl_Interp * interp, 
 				struct Nsf_Class * cl, CONST char * nm);
 #endif
-#ifndef NsfOSetInstVar_TCL_DECLARED
-#define NsfOSetInstVar_TCL_DECLARED
-/* 9 */
-EXTERN Tcl_Obj *	NsfOSetInstVar (struct Nsf_Object * obj, 
-				Tcl_Interp * interp, Tcl_Obj * name, 
-				Tcl_Obj * value, int flgs);
-#endif
-#ifndef NsfOGetInstVar_TCL_DECLARED
-#define NsfOGetInstVar_TCL_DECLARED
-/* 10 */
-EXTERN Tcl_Obj *	NsfOGetInstVar (struct Nsf_Object * obj, 
-				Tcl_Interp * interp, Tcl_Obj * name, 
-				int flgs);
-#endif
 #ifndef Nsf_ObjSetVar2_TCL_DECLARED
 #define Nsf_ObjSetVar2_TCL_DECLARED
-/* 11 */
+/* 8 */
 EXTERN Tcl_Obj *	Nsf_ObjSetVar2 (struct Nsf_Object * obj, 
 				Tcl_Interp * interp, Tcl_Obj * name1, 
 				Tcl_Obj * name2, Tcl_Obj * value, int flgs);
 #endif
 #ifndef Nsf_ObjGetVar2_TCL_DECLARED
 #define Nsf_ObjGetVar2_TCL_DECLARED
-/* 12 */
+/* 9 */
 EXTERN Tcl_Obj *	Nsf_ObjGetVar2 (struct Nsf_Object * obj, 
 				Tcl_Interp * interp, Tcl_Obj * name1, 
 				Tcl_Obj * name2, int flgs);
 #endif
-#ifndef NsfUnsetInstVar2_TCL_DECLARED
-#define NsfUnsetInstVar2_TCL_DECLARED
-/* 13 */
-EXTERN int		NsfUnsetInstVar2 (struct Nsf_Object * obj, 
+#ifndef Nsf_UnsetVar2_TCL_DECLARED
+#define Nsf_UnsetVar2_TCL_DECLARED
+/* 10 */
+EXTERN int		Nsf_UnsetVar2 (struct Nsf_Object * obj, 
 				Tcl_Interp * interp, CONST char * name1, 
 				CONST char * name2, int flgs);
 #endif
 #ifndef NsfDStringPrintf_TCL_DECLARED
 #define NsfDStringPrintf_TCL_DECLARED
-/* 14 */
+/* 11 */
 EXTERN void		NsfDStringPrintf (Tcl_DString * dsPtr, 
 				CONST char * fmt, va_list apSrc);
 #endif
 #ifndef NsfPrintError_TCL_DECLARED
 #define NsfPrintError_TCL_DECLARED
-/* 15 */
+/* 12 */
 EXTERN int		NsfPrintError (Tcl_Interp * interp, CONST char * fmt, ...);
 #endif
 #ifndef NsfErrInProc_TCL_DECLARED
 #define NsfErrInProc_TCL_DECLARED
-/* 16 */
+/* 13 */
 EXTERN int		NsfErrInProc (Tcl_Interp * interp, Tcl_Obj * objName, 
 				Tcl_Obj * clName, CONST char * procName);
 #endif
 #ifndef NsfObjErrType_TCL_DECLARED
 #define NsfObjErrType_TCL_DECLARED
-/* 17 */
+/* 14 */
 EXTERN int		NsfObjErrType (Tcl_Interp * interp, 
 				CONST char * context, Tcl_Obj * value, 
 				CONST char * type, Nsf_Param CONST * pPtr);
 #endif
 #ifndef NsfStackDump_TCL_DECLARED
 #define NsfStackDump_TCL_DECLARED
-/* 18 */
+/* 15 */
 EXTERN void		NsfStackDump (Tcl_Interp * interp);
 #endif
 #ifndef NsfSetObjClientData_TCL_DECLARED
 #define NsfSetObjClientData_TCL_DECLARED
-/* 19 */
+/* 16 */
 EXTERN void		NsfSetObjClientData (Nsf_Object * obj, 
 				ClientData data);
 #endif
 #ifndef NsfGetObjClientData_TCL_DECLARED
 #define NsfGetObjClientData_TCL_DECLARED
-/* 20 */
+/* 17 */
 EXTERN ClientData	NsfGetObjClientData (Nsf_Object * obj);
 #endif
 #ifndef NsfSetClassClientData_TCL_DECLARED
 #define NsfSetClassClientData_TCL_DECLARED
-/* 21 */
+/* 18 */
 EXTERN void		NsfSetClassClientData (Nsf_Class * cl, 
 				ClientData data);
 #endif
 #ifndef NsfGetClassClientData_TCL_DECLARED
 #define NsfGetClassClientData_TCL_DECLARED
-/* 22 */
+/* 19 */
 EXTERN ClientData	NsfGetClassClientData (Nsf_Class * cl);
 #endif
 #ifndef NsfRequireObjNamespace_TCL_DECLARED
 #define NsfRequireObjNamespace_TCL_DECLARED
-/* 23 */
+/* 20 */
 EXTERN void		NsfRequireObjNamespace (Tcl_Interp * interp, 
 				Nsf_Object * obj);
 #endif
-#ifndef NsfNextObjCmd_TCL_DECLARED
-#define NsfNextObjCmd_TCL_DECLARED
-/* 24 */
-EXTERN int		NsfNextObjCmd (ClientData cd, Tcl_Interp * interp, 
-				int objc, Tcl_Obj *CONST objv[]);
-#endif
 #ifndef NsfCallMethodWithArgs_TCL_DECLARED
 #define NsfCallMethodWithArgs_TCL_DECLARED
-/* 25 */
+/* 21 */
 EXTERN int		NsfCallMethodWithArgs (ClientData cd, 
 				Tcl_Interp * interp, Tcl_Obj * method, 
 				Tcl_Obj * arg, int objc, 
 				Tcl_Obj *CONST objv[], int flags);
 #endif
 #ifndef NsfAddObjectMethod_TCL_DECLARED
 #define NsfAddObjectMethod_TCL_DECLARED
-/* 26 */
+/* 22 */
 EXTERN int		NsfAddObjectMethod (Tcl_Interp * interp, 
 				struct Nsf_Object * obj, CONST char * nm, 
 				Tcl_ObjCmdProc * proc, ClientData cd, 
 				Tcl_CmdDeleteProc * dp, int flags);
 #endif
 #ifndef NsfAddClassMethod_TCL_DECLARED
 #define NsfAddClassMethod_TCL_DECLARED
-/* 27 */
+/* 23 */
 EXTERN int		NsfAddClassMethod (Tcl_Interp * interp, 
 				struct Nsf_Class * cl, CONST char * nm, 
 				Tcl_ObjCmdProc * proc, ClientData cd, 
 				Tcl_CmdDeleteProc * dp, int flags);
 #endif
 #ifndef NsfCreate_TCL_DECLARED
 #define NsfCreate_TCL_DECLARED
-/* 28 */
+/* 24 */
 EXTERN int		NsfCreate (Tcl_Interp * in, Nsf_Class * class, 
-				Tcl_Obj * name, ClientData data, int objc, 
+				Tcl_Obj * name, int objc, 
 				Tcl_Obj *CONST objv[]);
 #endif
 
@@ -215,30 +189,26 @@
     struct Nsf_Class * (*nsfIsClass) (Tcl_Interp * interp, ClientData cd); /* 2 */
     struct Nsf_Object * (*nsfGetObject) (Tcl_Interp * interp, CONST char * name); /* 3 */
     struct Nsf_Class * (*nsfGetClass) (Tcl_Interp * interp, CONST char * name); /* 4 */
-    int (*nsfCreateObject) (Tcl_Interp * interp, Tcl_Obj * name, struct Nsf_Class * cl); /* 5 */
-    int (*nsfDeleteObject) (Tcl_Interp * interp, struct Nsf_Object * obj); /* 6 */
-    int (*nsfRemoveObjectMethod) (Tcl_Interp * interp, struct Nsf_Object * obj, CONST char * nm); /* 7 */
-    int (*nsfRemoveClassMethod) (Tcl_Interp * interp, struct Nsf_Class * cl, CONST char * nm); /* 8 */
-    Tcl_Obj * (*nsfOSetInstVar) (struct Nsf_Object * obj, Tcl_Interp * interp, Tcl_Obj * name, Tcl_Obj * value, int flgs); /* 9 */
-    Tcl_Obj * (*nsfOGetInstVar) (struct Nsf_Object * obj, Tcl_Interp * interp, Tcl_Obj * name, int flgs); /* 10 */
-    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, Tcl_Obj * value, int flgs); /* 11 */
-    Tcl_Obj * (*nsf_ObjGetVar2) (struct Nsf_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, int flgs); /* 12 */
-    int (*nsfUnsetInstVar2) (struct Nsf_Object * obj, Tcl_Interp * interp, CONST char * name1, CONST char * name2, int flgs); /* 13 */
-    void (*nsfDStringPrintf) (Tcl_DString * dsPtr, CONST char * fmt, va_list apSrc); /* 14 */
-    int (*nsfPrintError) (Tcl_Interp * interp, CONST char * fmt, ...); /* 15 */
-    int (*nsfErrInProc) (Tcl_Interp * interp, Tcl_Obj * objName, Tcl_Obj * clName, CONST char * procName); /* 16 */
-    int (*nsfObjErrType) (Tcl_Interp * interp, CONST char * context, Tcl_Obj * value, CONST char * type, Nsf_Param CONST * pPtr); /* 17 */
-    void (*nsfStackDump) (Tcl_Interp * interp); /* 18 */
-    void (*nsfSetObjClientData) (Nsf_Object * obj, ClientData data); /* 19 */
-    ClientData (*nsfGetObjClientData) (Nsf_Object * obj); /* 20 */
-    void (*nsfSetClassClientData) (Nsf_Class * cl, ClientData data); /* 21 */
-    ClientData (*nsfGetClassClientData) (Nsf_Class * cl); /* 22 */
-    void (*nsfRequireObjNamespace) (Tcl_Interp * interp, Nsf_Object * obj); /* 23 */
-    int (*nsfNextObjCmd) (ClientData cd, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 24 */
-    int (*nsfCallMethodWithArgs) (ClientData cd, Tcl_Interp * interp, Tcl_Obj * method, Tcl_Obj * arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 25 */
-    int (*nsfAddObjectMethod) (Tcl_Interp * interp, struct Nsf_Object * obj, CONST char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags); /* 26 */
-    int (*nsfAddClassMethod) (Tcl_Interp * interp, struct Nsf_Class * cl, CONST char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags); /* 27 */
-    int (*nsfCreate) (Tcl_Interp * in, Nsf_Class * class, Tcl_Obj * name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 28 */
+    int (*nsfDeleteObject) (Tcl_Interp * interp, struct Nsf_Object * obj); /* 5 */
+    int (*nsfRemoveObjectMethod) (Tcl_Interp * interp, struct Nsf_Object * obj, CONST char * nm); /* 6 */
+    int (*nsfRemoveClassMethod) (Tcl_Interp * interp, struct Nsf_Class * cl, CONST char * nm); /* 7 */
+    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, Tcl_Obj * value, int flgs); /* 8 */
+    Tcl_Obj * (*nsf_ObjGetVar2) (struct Nsf_Object * obj, Tcl_Interp * interp, Tcl_Obj * name1, Tcl_Obj * name2, int flgs); /* 9 */
+    int (*nsf_UnsetVar2) (struct Nsf_Object * obj, Tcl_Interp * interp, CONST char * name1, CONST char * name2, int flgs); /* 10 */
+    void (*nsfDStringPrintf) (Tcl_DString * dsPtr, CONST char * fmt, va_list apSrc); /* 11 */
+    int (*nsfPrintError) (Tcl_Interp * interp, CONST char * fmt, ...); /* 12 */
+    int (*nsfErrInProc) (Tcl_Interp * interp, Tcl_Obj * objName, Tcl_Obj * clName, CONST char * procName); /* 13 */
+    int (*nsfObjErrType) (Tcl_Interp * interp, CONST char * context, Tcl_Obj * value, CONST char * type, Nsf_Param CONST * pPtr); /* 14 */
+    void (*nsfStackDump) (Tcl_Interp * interp); /* 15 */
+    void (*nsfSetObjClientData) (Nsf_Object * obj, ClientData data); /* 16 */
+    ClientData (*nsfGetObjClientData) (Nsf_Object * obj); /* 17 */
+    void (*nsfSetClassClientData) (Nsf_Class * cl, ClientData data); /* 18 */
+    ClientData (*nsfGetClassClientData) (Nsf_Class * cl); /* 19 */
+    void (*nsfRequireObjNamespace) (Tcl_Interp * interp, Nsf_Object * obj); /* 20 */
+    int (*nsfCallMethodWithArgs) (ClientData cd, Tcl_Interp * interp, Tcl_Obj * method, Tcl_Obj * arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 21 */
+    int (*nsfAddObjectMethod) (Tcl_Interp * interp, struct Nsf_Object * obj, CONST char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags); /* 22 */
+    int (*nsfAddClassMethod) (Tcl_Interp * interp, struct Nsf_Class * cl, CONST char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags); /* 23 */
+    int (*nsfCreate) (Tcl_Interp * in, Nsf_Class * class, Tcl_Obj * name, int objc, Tcl_Obj *CONST objv[]); /* 24 */
 } NsfStubs;
 
 #ifdef __cplusplus
@@ -272,101 +242,85 @@
 #define NsfGetClass \
 	(nsfStubsPtr->nsfGetClass) /* 4 */
 #endif
-#ifndef NsfCreateObject
-#define NsfCreateObject \
-	(nsfStubsPtr->nsfCreateObject) /* 5 */
-#endif
 #ifndef NsfDeleteObject
 #define NsfDeleteObject \
-	(nsfStubsPtr->nsfDeleteObject) /* 6 */
+	(nsfStubsPtr->nsfDeleteObject) /* 5 */
 #endif
 #ifndef NsfRemoveObjectMethod
 #define NsfRemoveObjectMethod \
-	(nsfStubsPtr->nsfRemoveObjectMethod) /* 7 */
+	(nsfStubsPtr->nsfRemoveObjectMethod) /* 6 */
 #endif
 #ifndef NsfRemoveClassMethod
 #define NsfRemoveClassMethod \
-	(nsfStubsPtr->nsfRemoveClassMethod) /* 8 */
+	(nsfStubsPtr->nsfRemoveClassMethod) /* 7 */
 #endif
-#ifndef NsfOSetInstVar
-#define NsfOSetInstVar \
-	(nsfStubsPtr->nsfOSetInstVar) /* 9 */
-#endif
-#ifndef NsfOGetInstVar
-#define NsfOGetInstVar \
-	(nsfStubsPtr->nsfOGetInstVar) /* 10 */
-#endif
 #ifndef Nsf_ObjSetVar2
 #define Nsf_ObjSetVar2 \
-	(nsfStubsPtr->nsf_ObjSetVar2) /* 11 */
+	(nsfStubsPtr->nsf_ObjSetVar2) /* 8 */
 #endif
 #ifndef Nsf_ObjGetVar2
 #define Nsf_ObjGetVar2 \
-	(nsfStubsPtr->nsf_ObjGetVar2) /* 12 */
+	(nsfStubsPtr->nsf_ObjGetVar2) /* 9 */
 #endif
-#ifndef NsfUnsetInstVar2
-#define NsfUnsetInstVar2 \
-	(nsfStubsPtr->nsfUnsetInstVar2) /* 13 */
+#ifndef Nsf_UnsetVar2
+#define Nsf_UnsetVar2 \
+	(nsfStubsPtr->nsf_UnsetVar2) /* 10 */
 #endif
 #ifndef NsfDStringPrintf
 #define NsfDStringPrintf \
-	(nsfStubsPtr->nsfDStringPrintf) /* 14 */
+	(nsfStubsPtr->nsfDStringPrintf) /* 11 */
 #endif
 #ifndef NsfPrintError
 #define NsfPrintError \
-	(nsfStubsPtr->nsfPrintError) /* 15 */
+	(nsfStubsPtr->nsfPrintError) /* 12 */
 #endif
 #ifndef NsfErrInProc
 #define NsfErrInProc \
-	(nsfStubsPtr->nsfErrInProc) /* 16 */
+	(nsfStubsPtr->nsfErrInProc) /* 13 */
 #endif
 #ifndef NsfObjErrType
 #define NsfObjErrType \
-	(nsfStubsPtr->nsfObjErrType) /* 17 */
+	(nsfStubsPtr->nsfObjErrType) /* 14 */
 #endif
 #ifndef NsfStackDump
 #define NsfStackDump \
-	(nsfStubsPtr->nsfStackDump) /* 18 */
+	(nsfStubsPtr->nsfStackDump) /* 15 */
 #endif
 #ifndef NsfSetObjClientData
 #define NsfSetObjClientData \
-	(nsfStubsPtr->nsfSetObjClientData) /* 19 */
+	(nsfStubsPtr->nsfSetObjClientData) /* 16 */
 #endif
 #ifndef NsfGetObjClientData
 #define NsfGetObjClientData \
-	(nsfStubsPtr->nsfGetObjClientData) /* 20 */
+	(nsfStubsPtr->nsfGetObjClientData) /* 17 */
 #endif
 #ifndef NsfSetClassClientData
 #define NsfSetClassClientData \
-	(nsfStubsPtr->nsfSetClassClientData) /* 21 */
+	(nsfStubsPtr->nsfSetClassClientData) /* 18 */
 #endif
 #ifndef NsfGetClassClientData
 #define NsfGetClassClientData \
-	(nsfStubsPtr->nsfGetClassClientData) /* 22 */
+	(nsfStubsPtr->nsfGetClassClientData) /* 19 */
 #endif
 #ifndef NsfRequireObjNamespace
 #define NsfRequireObjNamespace \
-	(nsfStubsPtr->nsfRequireObjNamespace) /* 23 */
+	(nsfStubsPtr->nsfRequireObjNamespace) /* 20 */
 #endif
-#ifndef NsfNextObjCmd
-#define NsfNextObjCmd \
-	(nsfStubsPtr->nsfNextObjCmd) /* 24 */
-#endif
 #ifndef NsfCallMethodWithArgs
 #define NsfCallMethodWithArgs \
-	(nsfStubsPtr->nsfCallMethodWithArgs) /* 25 */
+	(nsfStubsPtr->nsfCallMethodWithArgs) /* 21 */
 #endif
 #ifndef NsfAddObjectMethod
 #define NsfAddObjectMethod \
-	(nsfStubsPtr->nsfAddObjectMethod) /* 26 */
+	(nsfStubsPtr->nsfAddObjectMethod) /* 22 */
 #endif
 #ifndef NsfAddClassMethod
 #define NsfAddClassMethod \
-	(nsfStubsPtr->nsfAddClassMethod) /* 27 */
+	(nsfStubsPtr->nsfAddClassMethod) /* 23 */
 #endif
 #ifndef NsfCreate
 #define NsfCreate \
-	(nsfStubsPtr->nsfCreate) /* 28 */
+	(nsfStubsPtr->nsfCreate) /* 24 */
 #endif
 
 #endif /* defined(USE_NSF_STUBS) && !defined(USE_NSF_STUB_PROCS) */