Index: TODO
===================================================================
diff -u -r5ac181c476d57605fa36543024392af0710a82dd -r14965323980c2235c37b67ddbb19343ddbdaa41c
--- TODO	(.../TODO)	(revision 5ac181c476d57605fa36543024392af0710a82dd)
+++ TODO	(.../TODO)	(revision 14965323980c2235c37b67ddbb19343ddbdaa41c)
@@ -1687,15 +1687,65 @@
   in serializer
 - cleanup aol-xotcl.tcl and document usage in aolserver and naviserver
 
+- iteration over TODO file
+- removed obsolete entries from generic/nsf.decls und generic/nsfInt.decls
+- removed NSF_CMD_NOT_FOUND
+
 TODO: 
 
-- test xotcl-aol + aolserver 4.*
+- aolserver/nagiserver:
+  - test xotcl-aol + aolserver 4.*
+  - naviserver install
+
+     1) ./configure --with-tcl=/usr/local/src/tcl8.5.8/unix/ --with-xotclsh --enable-symbols
+        installiert nach /usr/local/aolserver/modules/tcl/xotcl.tcl
+
+     2) kein "modules" like aolserver for ns
+          sudo cp /usr/local/aolserver/modules/tcl/xotcl.tcl  /usr/local/ns/tcl/
+        currently, we install into //usr/local/ns/tcl/xotcl.tcl
+
 - show enumerated values in info parametersyntax
+
 - "-returns" 
   * leave syntax as is for method?
   * add flag to alias and forward?
+  * handle "returns" in serializer
 
-- method-modifiers/attribute-method.002:  incorrect result for 'set _ {}'
+- the two flags "-objscope" and "-nonleaf" are for adding frames,
+  and they are mutual exclusive. Make them a single flag?
+  check if both options are in every case sensible.
+
+  possible realizations:
+     -varscope instance|proc
+     -scope object|method
+
+   * instance: within this method, all non-prefixed var names 
+     refer to instance variables; the method can use most 
+     probably not "next"
+     (actually, only needed for XOTcl)
+
+   * proc: within this method, we can use colon-prefixed 
+     variables; the method can use "next"
+
+   "object" könnte mit dem -per-object (dem registierungpunkt)
+   leicht verwechselt werden. es ginge auch
+       -varscope instance|method
+   allerdings, meint method eigentlich "scripted method".
+   Eine weitere option wäre:
+       -varscope instance|resolver
+
+   effected are: 
+     alias, forward, dispatch
+
+   für "alias" betrifft das in gleicher form auch die cmds,
+   bei "dispatch" und "forward" gibt es dzt. kein "-nonleaf"
+
+- in the following, we need just a frame, but not necessarily an "-objscope"
+  set x [::xotcl::dispatch $value -objscope ::xotcl::self]
+
+
+- some error cases can lead to an invalid activation count
+  method-modifiers/attribute-method.002:  incorrect result for 'set _ {}'
         expected: '::C::A', got ''
         in test file ./tests/method-modifiers.tcl
   ... => 
@@ -1705,6 +1755,28 @@
 
 - extend coro regression test
 
+- handle bug with ::variable with colon-prefixed name
+
+- work on replacing SKIP_LEVELS by SKIP_LAMBDE for openacs (works with 
+  regression test, has problems with OrderedComposite::ChildManager.init)
+  Note concerning treating CMETHOD_FRAME like METHOD_FRAMES: we did
+  this change for NsfCallStackFindLastInvocation(), but nsfStack.c has
+  still several occurences, where they are treated differently.
+
+- add "::nsf::configure verbose on|off" ... or "warning"? or "debug level"?
+
+- C-interface
+    * rework C-interface
+    * maybe for post-alpha, but we have be first clear
+      on scope and intention. A possibility would be
+      to provide all entries from gentclAPI, but we would
+      loose most likely static property and the newly
+      achieved ease of changing is effectively frozen 
+      by the stubs interface, which has to be stable.
+
+- copy decls for objectMethod and classMethod as comments
+  to xotcl.c, fix and check order
+
 - nameing
 
     * namespace prefix 
@@ -1733,11 +1805,37 @@
    - tutorial (split)
    - migration guide
 
-   - interfaces in documentation for slots (see for more details 
-     ::nx::Class#superclass in nx.tcl)
+   text
    - use term "callprotection" in documentation for public|protected
      (to be consistent with "... info methods ...")
+   - reduce indenting for code examples in documentation 
+    (high indentation makes readability worse).
+    i use usually just 2, 4 are ok as well; we should decide.
+   - use tcl parametersyntax for short description of commands/methods
 
+   - deal with interally-called methods (can be overloaded by the application)
+      * user-called and interanlly called (e.g. from "create" or "new")
+        XO_c_create_idx, XO_o_destroy_idx, XO_o_move_idx, 
+     * not documented yet:
+        XO_c_requireobject_idx, XO_o_defaultmethod_idx, XO_o_init_idx, 
+        XO_o_objectparameter_idx, XO_o_unknown_idx
+     * only XOTCL2:
+        XO_o_cleanup_idx, XO_o_residualargs_idx,
+
+   doctools
+   - interfaces in documentation for slots (see for more details 
+     ::nx::Class#superclass in nx.tcl)
+   - integrate ::nx::doc::make with Makefile.in
+     (provide shell calls and, targets and dependencies)
+   - make quality checks (missing documentation, ...) optional?
+     how to deal with non-resolvable quality checks?
+   - handle object methods as well in quality checks
+   - why does one have to specify @superclass rather than determining the
+     superclass via introspection?
+   - provide a renderer for XOTcl @-notation to produce object structure
+     for the new doctool (makes the old documentation usabel, eg. for XOTcl2)
+
+
 - library + apps
     - new directory structure DONE
     - work on binary packages of xotcl (store + xml)
@@ -1754,123 +1852,9 @@
 
 TODO "Kleinigkeiten"
 
-- C-interface
-    * generic/nsf.decls und generic/nsfInt.decls ausmisten 
-      (leere einträge weg, binärkompatibility mit xotcl nicht notwendig,
-      da library anders heisst)
-    * C-interface überarbeiten
-# SS: das wäre auch etwas für die post-alpha phase, oder?
-
-- integrate ::nx::doc::make with Makefile.in
-  (provide shell calls and, targets and dependencies)
-- decide on syntax in documentation
-  (info method parameter | info method parametersyntax)
-
-- reduce indenting for code examples in documentation (high indentation makes readability worse).
-  i use usually jsut 2, 4 are ok as well; we should decide.
-- make quality checks (missing documentation, ...) optional (maybe?)
-- handle object methods as well in quality checks
-- why does one have to specify @superclass rather than determining the
-  superclass via introspection?
-
-- die folgenden calls sind streng genommen auch internally-called (d.h. von c aus aufgerufen), 
-  aber aus unterscheidl. gründen noch nicht als solche gekennzeichnet:
-
-  * wird meist vom benutzer aufgerufen, allerdings auch intern (bspw "reate" von "new")
-    XO_c_create_idx, 
-    XO_o_destroy_idx, 
-    XO_o_move_idx, 
-
-  * not documented yet
-    XO_c_requireobject_idx, 
-    XO_o_defaultmethod_idx, 
-    XO_o_init_idx, 
-    XO_o_objectparameter_idx, 
-    XO_o_unknown_idx
-
-  * only XOTCL2:
-     XO_o_cleanup_idx, 
-     XO_o_residualargs_idx,
-
-- Either transfer documentation for xotcl from @-notation to new doc system,
-  or (maybe better) provide a renderer for @-structures to new doc system
-  infrastructure (less work).
-
-- copy decls for objectMethod and classMethod  as comments
-  to xotcl.c, fix and check order
-
 - should we continue to work on the problem of the interp-aliased class,
   exported from one ns, imported into another one?
 
-- should we extract parameter decls from pseudo-comments from the c source
-  each time we change .decls, we have to change the c-code as well.
-  /* *TCL*
-  infoClassMethod superclass XOTclClassInfoSuperclassMethod {
-    {-argName "class"  -required 1 -type class}
-    {-argName "-closure"}
-    {-argName "pattern" -type tclobj}
-  }
-  */
-  we could preprocess xotcl.c and add code to the current .decls.
-
-  OTOH: 
-    * also doc would move into the c-code (maybe not bad)
-    * we could not detect automatically changes in the decls,
-      if these are generated from c, rebuild would have 
-      to run for every compilation.
-
-  Opinions?
-
-- aolserver 
-   * install
-   * namespace collector (for blueprint)
-
-- naviserver install
-
-  1) ./configure --with-tcl=/usr/local/src/tcl8.5.8/unix/ --with-xotclsh --enable-symbols
-     installiert nach /usr/local/aolserver/modules/tcl/xotcl.tcl
-
-  2) kein "modules" like aolserver for ns
-        sudo cp /usr/local/aolserver/modules/tcl/xotcl.tcl  /usr/local/ns/tcl/
-     currently, we install into //usr/local/ns/tcl/xotcl.tcl
-
-- the two flags "-objscope" and "-nonleaf" are for adding frames,
-  and they are mutual exclusive. Make them a single flag?
-  check if both options are in every case sensible.
-
-  possible realizations:
-     -varscope instance|proc
-     -scope object|method
-
-   * instance: within this method, all non-prefixed var names 
-     refer to instance variables; the method can use most 
-     probably not "next"
-     (actually, only needed for XOTcl)
-
-   * proc: within this method, we can use colon-prefixed 
-     variables; the method can use "next"
-
-   "object" könnte mit dem -per-object (dem registierungpunkt)
-   leicht verwechselt werden. es ginge auch
-       -varscope instance|method
-   allerdings, meint method eigentlich "scripted method".
-   Eine weitere option wäre:
-       -varscope instance|resolver
-
-  effected are: 
-     alias
-     forward
-     dispatch
-
-  für "alias" betrifft das in gleicher form auch die cmds,
-  bei "dispatch" und "forward" gibt es dzt. kein "-nonleaf"
-
-- support -nonleaf for "dispatch" ?
-  in the following, we need just a frame, but not necessarily an "-objscope"
-  set x [::xotcl::dispatch $value -objscope ::xotcl::self]
-
-- XOTCL_CMD_NOT_FOUND
-- add all xotcl*cmds to C api, including importvar
 - constants in type converter (in and out)
 
 - genau genommen sind folgende info-Methoden unnötig:
Index: generic/nsf.c
===================================================================
diff -u -r58cc08f13241fd1ef0cf9e948fb84c804ade4690 -r14965323980c2235c37b67ddbb19343ddbdaa41c
--- generic/nsf.c	(.../nsf.c)	(revision 58cc08f13241fd1ef0cf9e948fb84c804ade4690)
+++ generic/nsf.c	(.../nsf.c)	(revision 14965323980c2235c37b67ddbb19343ddbdaa41c)
@@ -3001,7 +3001,7 @@
 
     PrimitiveDestroy((ClientData) object);
 
-    if (!(object->flags & NSF_TCL_DELETE) /*&& !(object->flags & NSF_CMD_NOT_FOUND)*/) {
+    if (!(object->flags & NSF_TCL_DELETE)) {
       Tcl_Obj *savedObjResult = Tcl_GetObjResult(interp);
       INCR_REF_COUNT(savedObjResult);
       /*fprintf(stderr, "    before DeleteCommandFromToken %p object flags %.6x\n", oid, object->flags);*/
@@ -14435,7 +14435,6 @@
 	 * In case, the call of the dealloc method has failed above (e.g. NS_DYING),
          * we have to call dealloc manually, otherwise we have a memory leak
          */
-        /*object->flags |= NSF_CMD_NOT_FOUND;*/
         /*fprintf(stderr, "*** dealloc failed for %p %s flags %.6x, retry\n",
 	  object, objectName(object), object->flags);*/
         result = DoDealloc(interp, object);
Index: generic/nsf.decls
===================================================================
diff -u -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r14965323980c2235c37b67ddbb19343ddbdaa41c
--- generic/nsf.decls	(.../nsf.decls)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
+++ generic/nsf.decls	(.../nsf.decls)	(revision 14965323980c2235c37b67ddbb19343ddbdaa41c)
@@ -30,149 +30,107 @@
 declare 2 generic {
     struct Nsf_Class *NsfIsClass(Tcl_Interp *interp, ClientData cd)
 }
-#declare 3 generic {
-#
-#}
-declare 4 generic {
+declare 3 generic {
     struct Nsf_Object *NsfGetObject(Tcl_Interp *interp, CONST char *name)
 }
-declare 5 generic {
+declare 4 generic {
     struct Nsf_Class *NsfGetClass(Tcl_Interp *interp, CONST char *name)
 }
-declare 6 generic {
+declare 5 generic {
     int NsfCreateObject(Tcl_Interp *interp, Tcl_Obj *name, struct Nsf_Class *cl)
 }
-#declare 7 generic {
-#
-#}
-#declare 8 generic {
-#    int NsfCreateClass(Tcl_Interp *interp, Tcl_Obj *name, struct Nsf_Class *cl)
-#}
-declare 9 generic {
+declare 6 generic {
     int NsfDeleteObject(Tcl_Interp *interp, struct Nsf_Object *obj)
 }
-#declare 10 generic {
-#    int NsfDeleteClass(Tcl_Interp *interp, struct Nsf_Class *cl)
-#}
-#declare 11 generic {
-#    int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, 
-#                         CONST char* nm, Tcl_ObjCmdProc* proc,
-#	                 ClientData cd, Tcl_CmdDeleteProc *dp)
-#}
-#declare 12 generic {
-#    int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, 
-#                         CONST char* nm, Tcl_ObjCmdProc* proc,
-#	                 ClientData cd, Tcl_CmdDeleteProc *dp)
-#}
-declare 13 generic {
+declare 7 generic {
     int NsfRemoveObjectMethod(Tcl_Interp *interp,struct Nsf_Object *obj, CONST char *nm)
 }
-declare 14 generic {
+declare 8 generic {
     int NsfRemoveClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm)
 }
-declare 15 generic {
+declare 9 generic {
     Tcl_Obj *NsfOSetInstVar(struct Nsf_Object *obj, Tcl_Interp *interp,
 	       Tcl_Obj *name, Tcl_Obj *value, int flgs)
 }
-declare 16 generic {
+declare 10 generic {
     Tcl_Obj *NsfOGetInstVar(struct Nsf_Object *obj, Tcl_Interp *interp,
 	       Tcl_Obj *name, int flgs)
 }
-#declare 17 generic {
-#    int	NsfInstVar(struct Nsf_Object *obj, Tcl_Interp *interp,
-#	     char *name, char *destName)
-#}
-#declare 18 generic {
-#
-#}
-declare 19 generic {
+declare 11 generic {
     Tcl_Obj *Nsf_ObjSetVar2(struct Nsf_Object *obj,
                  Tcl_Interp *interp,Tcl_Obj *name1,Tcl_Obj *name2,
 		 Tcl_Obj *value,int flgs)
 }
-declare 20 generic {
+declare 12 generic {
     Tcl_Obj *Nsf_ObjGetVar2(struct Nsf_Object *obj, 
                  Tcl_Interp *interp,Tcl_Obj *name1,Tcl_Obj *name2,
 		 int flgs)
 }
-declare 21 generic {
+declare 13 generic {
     int NsfUnsetInstVar2(struct Nsf_Object *obj, Tcl_Interp *interp, 
                            CONST char *name1, CONST char *name2, 
 		           int flgs)
 }
-#declare 22 generic {
-#    int Nsf_TraceObjCmd(ClientData cd, Tcl_Interp *interp,
-#                          int objc, Tcl_Obj *CONST objv[])
-#}
-declare 23 generic {
+declare 14 generic {
     int NsfErrMsg(Tcl_Interp *interp, char *msg, Tcl_FreeProc *type)
 }
-declare 24 generic {
+declare 15 generic {
     int NsfVarErrMsg(Tcl_Interp  *interp, ...)
 }
-declare 25 generic {
+declare 16 generic {
     int NsfErrInProc (Tcl_Interp *interp, Tcl_Obj *objName,
 		Tcl_Obj *clName, CONST char *procName)
 }
-#declare 26 generic {
-#
-#}
-declare 27 generic {
+declare 17 generic {
    int NsfErrBadVal_(Tcl_Interp *interp, char *expected, char *value)
 }
-declare 28 generic {
+declare 18 generic {
     int NsfObjErrType(Tcl_Interp *interp, Tcl_Obj *nm, char *wt, char *parameterName)
 }
-declare 29 generic {
+declare 19 generic {
     void NsfStackDump (Tcl_Interp *interp)
 }
-#declare 30 generic {
-#    void NsfCallStackDump (Tcl_Interp *interp)
-#}
-#declare 31 generic {
-#    void NsfDeprecatedMsg(char *oldCmd, char *newCmd)
-#}
-declare 32 generic {
+declare 20 generic {
     void NsfSetObjClientData(Nsf_Object *obj, ClientData data)
 }
-declare 33 generic {
+declare 21 generic {
     ClientData NsfGetObjClientData(Nsf_Object *obj)
 }
-declare 34 generic {
+declare 22 generic {
     void NsfSetClassClientData(Nsf_Class *cl, ClientData data)
 }
-declare 35 generic {
+declare 23 generic {
     ClientData NsfGetClassClientData(Nsf_Class *cl)
 }
-declare 36 generic {
+declare 24 generic {
     void NsfRequireObjNamespace(Tcl_Interp *interp, Nsf_Object *obj)
 }
-declare 37 generic {
+declare 25 generic {
     int NsfErrBadVal(Tcl_Interp *interp, char *context, char *expected, CONST char *value)
 }
-declare 38 generic {
+declare 26 generic {
         int NsfNextObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 }
-declare 39 generic {
+declare 27 generic {
         int  NsfCallMethodWithArgs(ClientData cd, Tcl_Interp *interp, 
                 Tcl_Obj *method, Tcl_Obj *arg,
        	         int objc, Tcl_Obj *CONST objv[], int flags)
 }
-declare 40 generic {
+declare 28 generic {
     int NsfObjErrArgCnt(Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, 
                                      char *arglist)
 }
-declare 41 generic {
+declare 29 generic {
     int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, 
                          CONST char *nm, Tcl_ObjCmdProc *proc,
 	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
-declare 42 generic {
+declare 30 generic {
    int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, 
                          CONST char *nm, Tcl_ObjCmdProc *proc,
 	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
-declare 43 generic {
+declare 31 generic {
     int NsfCreate(Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, ClientData data,
             int objc, Tcl_Obj *CONST objv[])
 }
Index: generic/nsfDecls.h
===================================================================
diff -u -r4bc11ec1e9cd6e45a64251a3ee98053c552fe9ec -r14965323980c2235c37b67ddbb19343ddbdaa41c
--- generic/nsfDecls.h	(.../nsfDecls.h)	(revision 4bc11ec1e9cd6e45a64251a3ee98053c552fe9ec)
+++ generic/nsfDecls.h	(.../nsfDecls.h)	(revision 14965323980c2235c37b67ddbb19343ddbdaa41c)
@@ -28,201 +28,195 @@
 #ifndef Nsf_Init_TCL_DECLARED
 #define Nsf_Init_TCL_DECLARED
 /* 0 */
-EXTERN int		Nsf_Init(Tcl_Interp *interp);
+EXTERN int		Nsf_Init (Tcl_Interp * interp);
 #endif
 /* Slot 1 is reserved */
 #ifndef NsfIsClass_TCL_DECLARED
 #define NsfIsClass_TCL_DECLARED
 /* 2 */
-EXTERN struct Nsf_Class * NsfIsClass(Tcl_Interp *interp, ClientData cd);
+EXTERN struct Nsf_Class * NsfIsClass (Tcl_Interp * interp, ClientData cd);
 #endif
-/* Slot 3 is reserved */
 #ifndef NsfGetObject_TCL_DECLARED
 #define NsfGetObject_TCL_DECLARED
-/* 4 */
-EXTERN struct Nsf_Object * NsfGetObject(Tcl_Interp *interp, CONST char *name);
+/* 3 */
+EXTERN struct Nsf_Object * NsfGetObject (Tcl_Interp * interp, 
+				CONST char * name);
 #endif
 #ifndef NsfGetClass_TCL_DECLARED
 #define NsfGetClass_TCL_DECLARED
-/* 5 */
-EXTERN struct Nsf_Class * NsfGetClass(Tcl_Interp *interp, CONST char *name);
+/* 4 */
+EXTERN struct Nsf_Class * NsfGetClass (Tcl_Interp * interp, 
+				CONST char * name);
 #endif
 #ifndef NsfCreateObject_TCL_DECLARED
 #define NsfCreateObject_TCL_DECLARED
-/* 6 */
-EXTERN int		NsfCreateObject(Tcl_Interp *interp, Tcl_Obj *name,
-				struct Nsf_Class *cl);
+/* 5 */
+EXTERN int		NsfCreateObject (Tcl_Interp * interp, Tcl_Obj * name, 
+				struct Nsf_Class * cl);
 #endif
-/* Slot 7 is reserved */
-/* Slot 8 is reserved */
 #ifndef NsfDeleteObject_TCL_DECLARED
 #define NsfDeleteObject_TCL_DECLARED
-/* 9 */
-EXTERN int		NsfDeleteObject(Tcl_Interp *interp,
-				struct Nsf_Object *obj);
+/* 6 */
+EXTERN int		NsfDeleteObject (Tcl_Interp * interp, 
+				struct Nsf_Object * obj);
 #endif
-/* Slot 10 is reserved */
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
 #ifndef NsfRemoveObjectMethod_TCL_DECLARED
 #define NsfRemoveObjectMethod_TCL_DECLARED
-/* 13 */
-EXTERN int		NsfRemoveObjectMethod(Tcl_Interp *interp,
-				struct Nsf_Object *obj, CONST char *nm);
+/* 7 */
+EXTERN int		NsfRemoveObjectMethod (Tcl_Interp * interp, 
+				struct Nsf_Object * obj, CONST char * nm);
 #endif
 #ifndef NsfRemoveClassMethod_TCL_DECLARED
 #define NsfRemoveClassMethod_TCL_DECLARED
-/* 14 */
-EXTERN int		NsfRemoveClassMethod(Tcl_Interp *interp,
-				struct Nsf_Class *cl, CONST char *nm);
+/* 8 */
+EXTERN int		NsfRemoveClassMethod (Tcl_Interp * interp, 
+				struct Nsf_Class * cl, CONST char * nm);
 #endif
 #ifndef NsfOSetInstVar_TCL_DECLARED
 #define NsfOSetInstVar_TCL_DECLARED
-/* 15 */
-EXTERN Tcl_Obj *	NsfOSetInstVar(struct Nsf_Object *obj,
-				Tcl_Interp *interp, Tcl_Obj *name,
-				Tcl_Obj *value, int flgs);
+/* 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
-/* 16 */
-EXTERN Tcl_Obj *	NsfOGetInstVar(struct Nsf_Object *obj,
-				Tcl_Interp *interp, Tcl_Obj *name, int flgs);
+/* 10 */
+EXTERN Tcl_Obj *	NsfOGetInstVar (struct Nsf_Object * obj, 
+				Tcl_Interp * interp, Tcl_Obj * name, 
+				int flgs);
 #endif
-/* Slot 17 is reserved */
-/* Slot 18 is reserved */
 #ifndef Nsf_ObjSetVar2_TCL_DECLARED
 #define Nsf_ObjSetVar2_TCL_DECLARED
-/* 19 */
-EXTERN Tcl_Obj *	Nsf_ObjSetVar2(struct Nsf_Object *obj,
-				Tcl_Interp *interp, Tcl_Obj *name1,
-				Tcl_Obj *name2, Tcl_Obj *value, int flgs);
+/* 11 */
+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
-/* 20 */
-EXTERN Tcl_Obj *	Nsf_ObjGetVar2(struct Nsf_Object *obj,
-				Tcl_Interp *interp, Tcl_Obj *name1,
-				Tcl_Obj *name2, int flgs);
+/* 12 */
+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
-/* 21 */
-EXTERN int		NsfUnsetInstVar2(struct Nsf_Object *obj,
-				Tcl_Interp *interp, CONST char *name1,
-				CONST char *name2, int flgs);
+/* 13 */
+EXTERN int		NsfUnsetInstVar2 (struct Nsf_Object * obj, 
+				Tcl_Interp * interp, CONST char * name1, 
+				CONST char * name2, int flgs);
 #endif
-/* Slot 22 is reserved */
 #ifndef NsfErrMsg_TCL_DECLARED
 #define NsfErrMsg_TCL_DECLARED
-/* 23 */
-EXTERN int		NsfErrMsg(Tcl_Interp *interp, char *msg,
-				Tcl_FreeProc *type);
+/* 14 */
+EXTERN int		NsfErrMsg (Tcl_Interp * interp, char * msg, 
+				Tcl_FreeProc * type);
 #endif
 #ifndef NsfVarErrMsg_TCL_DECLARED
 #define NsfVarErrMsg_TCL_DECLARED
-/* 24 */
-EXTERN int		NsfVarErrMsg(Tcl_Interp *interp, ...);
+/* 15 */
+EXTERN int		NsfVarErrMsg (Tcl_Interp * interp, ...);
 #endif
 #ifndef NsfErrInProc_TCL_DECLARED
 #define NsfErrInProc_TCL_DECLARED
-/* 25 */
-EXTERN int		NsfErrInProc(Tcl_Interp *interp, Tcl_Obj *objName,
-				Tcl_Obj *clName, CONST char *procName);
+/* 16 */
+EXTERN int		NsfErrInProc (Tcl_Interp * interp, Tcl_Obj * objName, 
+				Tcl_Obj * clName, CONST char * procName);
 #endif
-/* Slot 26 is reserved */
 #ifndef NsfErrBadVal__TCL_DECLARED
 #define NsfErrBadVal__TCL_DECLARED
-/* 27 */
-EXTERN int		NsfErrBadVal_(Tcl_Interp *interp, char *expected,
-				char *value);
+/* 17 */
+EXTERN int		NsfErrBadVal_ (Tcl_Interp * interp, char * expected, 
+				char * value);
 #endif
 #ifndef NsfObjErrType_TCL_DECLARED
 #define NsfObjErrType_TCL_DECLARED
-/* 28 */
-EXTERN int		NsfObjErrType(Tcl_Interp *interp, Tcl_Obj *nm,
-				char *wt, char *parameterName);
+/* 18 */
+EXTERN int		NsfObjErrType (Tcl_Interp * interp, Tcl_Obj * nm, 
+				char * wt, char * parameterName);
 #endif
 #ifndef NsfStackDump_TCL_DECLARED
 #define NsfStackDump_TCL_DECLARED
-/* 29 */
-EXTERN void		NsfStackDump(Tcl_Interp *interp);
+/* 19 */
+EXTERN void		NsfStackDump (Tcl_Interp * interp);
 #endif
-/* Slot 30 is reserved */
-/* Slot 31 is reserved */
 #ifndef NsfSetObjClientData_TCL_DECLARED
 #define NsfSetObjClientData_TCL_DECLARED
-/* 32 */
-EXTERN void		NsfSetObjClientData(Nsf_Object *obj, ClientData data);
+/* 20 */
+EXTERN void		NsfSetObjClientData (Nsf_Object * obj, 
+				ClientData data);
 #endif
 #ifndef NsfGetObjClientData_TCL_DECLARED
 #define NsfGetObjClientData_TCL_DECLARED
-/* 33 */
-EXTERN ClientData	NsfGetObjClientData(Nsf_Object *obj);
+/* 21 */
+EXTERN ClientData	NsfGetObjClientData (Nsf_Object * obj);
 #endif
 #ifndef NsfSetClassClientData_TCL_DECLARED
 #define NsfSetClassClientData_TCL_DECLARED
-/* 34 */
-EXTERN void		NsfSetClassClientData(Nsf_Class *cl, ClientData data);
+/* 22 */
+EXTERN void		NsfSetClassClientData (Nsf_Class * cl, 
+				ClientData data);
 #endif
 #ifndef NsfGetClassClientData_TCL_DECLARED
 #define NsfGetClassClientData_TCL_DECLARED
-/* 35 */
-EXTERN ClientData	NsfGetClassClientData(Nsf_Class *cl);
+/* 23 */
+EXTERN ClientData	NsfGetClassClientData (Nsf_Class * cl);
 #endif
 #ifndef NsfRequireObjNamespace_TCL_DECLARED
 #define NsfRequireObjNamespace_TCL_DECLARED
-/* 36 */
-EXTERN void		NsfRequireObjNamespace(Tcl_Interp *interp,
-				Nsf_Object *obj);
+/* 24 */
+EXTERN void		NsfRequireObjNamespace (Tcl_Interp * interp, 
+				Nsf_Object * obj);
 #endif
 #ifndef NsfErrBadVal_TCL_DECLARED
 #define NsfErrBadVal_TCL_DECLARED
-/* 37 */
-EXTERN int		NsfErrBadVal(Tcl_Interp *interp, char *context,
-				char *expected, CONST char *value);
+/* 25 */
+EXTERN int		NsfErrBadVal (Tcl_Interp * interp, char * context, 
+				char * expected, CONST char * value);
 #endif
 #ifndef NsfNextObjCmd_TCL_DECLARED
 #define NsfNextObjCmd_TCL_DECLARED
-/* 38 */
-EXTERN int		NsfNextObjCmd(ClientData cd, Tcl_Interp *interp,
+/* 26 */
+EXTERN int		NsfNextObjCmd (ClientData cd, Tcl_Interp * interp, 
 				int objc, Tcl_Obj *CONST objv[]);
 #endif
 #ifndef NsfCallMethodWithArgs_TCL_DECLARED
 #define NsfCallMethodWithArgs_TCL_DECLARED
-/* 39 */
-EXTERN int		NsfCallMethodWithArgs(ClientData cd,
-				Tcl_Interp *interp, Tcl_Obj *method,
-				Tcl_Obj *arg, int objc,
+/* 27 */
+EXTERN int		NsfCallMethodWithArgs (ClientData cd, 
+				Tcl_Interp * interp, Tcl_Obj * method, 
+				Tcl_Obj * arg, int objc, 
 				Tcl_Obj *CONST objv[], int flags);
 #endif
 #ifndef NsfObjErrArgCnt_TCL_DECLARED
 #define NsfObjErrArgCnt_TCL_DECLARED
-/* 40 */
-EXTERN int		NsfObjErrArgCnt(Tcl_Interp *interp, Tcl_Obj *cmdName,
-				Tcl_Obj *methodName, char *arglist);
+/* 28 */
+EXTERN int		NsfObjErrArgCnt (Tcl_Interp * interp, 
+				Tcl_Obj * cmdName, Tcl_Obj * methodName, 
+				char * arglist);
 #endif
 #ifndef NsfAddObjectMethod_TCL_DECLARED
 #define NsfAddObjectMethod_TCL_DECLARED
-/* 41 */
-EXTERN int		NsfAddObjectMethod(Tcl_Interp *interp,
-				struct Nsf_Object *obj, CONST char *nm,
-				Tcl_ObjCmdProc *proc, ClientData cd,
-				Tcl_CmdDeleteProc *dp, int flags);
+/* 29 */
+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
-/* 42 */
-EXTERN int		NsfAddClassMethod(Tcl_Interp *interp,
-				struct Nsf_Class *cl, CONST char *nm,
-				Tcl_ObjCmdProc *proc, ClientData cd,
-				Tcl_CmdDeleteProc *dp, int flags);
+/* 30 */
+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
-/* 43 */
-EXTERN int		NsfCreate(Tcl_Interp *in, Nsf_Class *class,
-				Tcl_Obj *name, ClientData data, int objc,
+/* 31 */
+EXTERN int		NsfCreate (Tcl_Interp * in, Nsf_Class * class, 
+				Tcl_Obj * name, ClientData data, int objc, 
 				Tcl_Obj *CONST objv[]);
 #endif
 
@@ -234,50 +228,38 @@
     int magic;
     struct NsfStubHooks *hooks;
 
-    int (*nsf_Init) (Tcl_Interp *interp); /* 0 */
+    int (*nsf_Init) (Tcl_Interp * interp); /* 0 */
     void *reserved1;
-    struct Nsf_Class * (*nsfIsClass) (Tcl_Interp *interp, ClientData cd); /* 2 */
-    void *reserved3;
-    struct Nsf_Object * (*nsfGetObject) (Tcl_Interp *interp, CONST char *name); /* 4 */
-    struct Nsf_Class * (*nsfGetClass) (Tcl_Interp *interp, CONST char *name); /* 5 */
-    int (*nsfCreateObject) (Tcl_Interp *interp, Tcl_Obj *name, struct Nsf_Class *cl); /* 6 */
-    void *reserved7;
-    void *reserved8;
-    int (*nsfDeleteObject) (Tcl_Interp *interp, struct Nsf_Object *obj); /* 9 */
-    void *reserved10;
-    void *reserved11;
-    void *reserved12;
-    int (*nsfRemoveObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *obj, CONST char *nm); /* 13 */
-    int (*nsfRemoveClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm); /* 14 */
-    Tcl_Obj * (*nsfOSetInstVar) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, Tcl_Obj *value, int flgs); /* 15 */
-    Tcl_Obj * (*nsfOGetInstVar) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name, int flgs); /* 16 */
-    void *reserved17;
-    void *reserved18;
-    Tcl_Obj * (*nsf_ObjSetVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, Tcl_Obj *value, int flgs); /* 19 */
-    Tcl_Obj * (*nsf_ObjGetVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2, int flgs); /* 20 */
-    int (*nsfUnsetInstVar2) (struct Nsf_Object *obj, Tcl_Interp *interp, CONST char *name1, CONST char *name2, int flgs); /* 21 */
-    void *reserved22;
-    int (*nsfErrMsg) (Tcl_Interp *interp, char *msg, Tcl_FreeProc *type); /* 23 */
-    int (*nsfVarErrMsg) (Tcl_Interp *interp, ...); /* 24 */
-    int (*nsfErrInProc) (Tcl_Interp *interp, Tcl_Obj *objName, Tcl_Obj *clName, CONST char *procName); /* 25 */
-    void *reserved26;
-    int (*nsfErrBadVal_) (Tcl_Interp *interp, char *expected, char *value); /* 27 */
-    int (*nsfObjErrType) (Tcl_Interp *interp, Tcl_Obj *nm, char *wt, char *parameterName); /* 28 */
-    void (*nsfStackDump) (Tcl_Interp *interp); /* 29 */
-    void *reserved30;
-    void *reserved31;
-    void (*nsfSetObjClientData) (Nsf_Object *obj, ClientData data); /* 32 */
-    ClientData (*nsfGetObjClientData) (Nsf_Object *obj); /* 33 */
-    void (*nsfSetClassClientData) (Nsf_Class *cl, ClientData data); /* 34 */
-    ClientData (*nsfGetClassClientData) (Nsf_Class *cl); /* 35 */
-    void (*nsfRequireObjNamespace) (Tcl_Interp *interp, Nsf_Object *obj); /* 36 */
-    int (*nsfErrBadVal) (Tcl_Interp *interp, char *context, char *expected, CONST char *value); /* 37 */
-    int (*nsfNextObjCmd) (ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[]); /* 38 */
-    int (*nsfCallMethodWithArgs) (ClientData cd, Tcl_Interp *interp, Tcl_Obj *method, Tcl_Obj *arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 39 */
-    int (*nsfObjErrArgCnt) (Tcl_Interp *interp, Tcl_Obj *cmdName, Tcl_Obj *methodName, char *arglist); /* 40 */
-    int (*nsfAddObjectMethod) (Tcl_Interp *interp, struct Nsf_Object *obj, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 41 */
-    int (*nsfAddClassMethod) (Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm, Tcl_ObjCmdProc *proc, ClientData cd, Tcl_CmdDeleteProc *dp, int flags); /* 42 */
-    int (*nsfCreate) (Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 43 */
+    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 */
+    int (*nsfErrMsg) (Tcl_Interp * interp, char * msg, Tcl_FreeProc * type); /* 14 */
+    int (*nsfVarErrMsg) (Tcl_Interp * interp, ...); /* 15 */
+    int (*nsfErrInProc) (Tcl_Interp * interp, Tcl_Obj * objName, Tcl_Obj * clName, CONST char * procName); /* 16 */
+    int (*nsfErrBadVal_) (Tcl_Interp * interp, char * expected, char * value); /* 17 */
+    int (*nsfObjErrType) (Tcl_Interp * interp, Tcl_Obj * nm, char * wt, char * parameterName); /* 18 */
+    void (*nsfStackDump) (Tcl_Interp * interp); /* 19 */
+    void (*nsfSetObjClientData) (Nsf_Object * obj, ClientData data); /* 20 */
+    ClientData (*nsfGetObjClientData) (Nsf_Object * obj); /* 21 */
+    void (*nsfSetClassClientData) (Nsf_Class * cl, ClientData data); /* 22 */
+    ClientData (*nsfGetClassClientData) (Nsf_Class * cl); /* 23 */
+    void (*nsfRequireObjNamespace) (Tcl_Interp * interp, Nsf_Object * obj); /* 24 */
+    int (*nsfErrBadVal) (Tcl_Interp * interp, char * context, char * expected, CONST char * value); /* 25 */
+    int (*nsfNextObjCmd) (ClientData cd, Tcl_Interp * interp, int objc, Tcl_Obj *CONST objv[]); /* 26 */
+    int (*nsfCallMethodWithArgs) (ClientData cd, Tcl_Interp * interp, Tcl_Obj * method, Tcl_Obj * arg, int objc, Tcl_Obj *CONST objv[], int flags); /* 27 */
+    int (*nsfObjErrArgCnt) (Tcl_Interp * interp, Tcl_Obj * cmdName, Tcl_Obj * methodName, char * arglist); /* 28 */
+    int (*nsfAddObjectMethod) (Tcl_Interp * interp, struct Nsf_Object * obj, CONST char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags); /* 29 */
+    int (*nsfAddClassMethod) (Tcl_Interp * interp, struct Nsf_Class * cl, CONST char * nm, Tcl_ObjCmdProc * proc, ClientData cd, Tcl_CmdDeleteProc * dp, int flags); /* 30 */
+    int (*nsfCreate) (Tcl_Interp * in, Nsf_Class * class, Tcl_Obj * name, ClientData data, int objc, Tcl_Obj *CONST objv[]); /* 31 */
 } NsfStubs;
 
 #ifdef __cplusplus
@@ -303,133 +285,121 @@
 #define NsfIsClass \
 	(nsfStubsPtr->nsfIsClass) /* 2 */
 #endif
-/* Slot 3 is reserved */
 #ifndef NsfGetObject
 #define NsfGetObject \
-	(nsfStubsPtr->nsfGetObject) /* 4 */
+	(nsfStubsPtr->nsfGetObject) /* 3 */
 #endif
 #ifndef NsfGetClass
 #define NsfGetClass \
-	(nsfStubsPtr->nsfGetClass) /* 5 */
+	(nsfStubsPtr->nsfGetClass) /* 4 */
 #endif
 #ifndef NsfCreateObject
 #define NsfCreateObject \
-	(nsfStubsPtr->nsfCreateObject) /* 6 */
+	(nsfStubsPtr->nsfCreateObject) /* 5 */
 #endif
-/* Slot 7 is reserved */
-/* Slot 8 is reserved */
 #ifndef NsfDeleteObject
 #define NsfDeleteObject \
-	(nsfStubsPtr->nsfDeleteObject) /* 9 */
+	(nsfStubsPtr->nsfDeleteObject) /* 6 */
 #endif
-/* Slot 10 is reserved */
-/* Slot 11 is reserved */
-/* Slot 12 is reserved */
 #ifndef NsfRemoveObjectMethod
 #define NsfRemoveObjectMethod \
-	(nsfStubsPtr->nsfRemoveObjectMethod) /* 13 */
+	(nsfStubsPtr->nsfRemoveObjectMethod) /* 7 */
 #endif
 #ifndef NsfRemoveClassMethod
 #define NsfRemoveClassMethod \
-	(nsfStubsPtr->nsfRemoveClassMethod) /* 14 */
+	(nsfStubsPtr->nsfRemoveClassMethod) /* 8 */
 #endif
 #ifndef NsfOSetInstVar
 #define NsfOSetInstVar \
-	(nsfStubsPtr->nsfOSetInstVar) /* 15 */
+	(nsfStubsPtr->nsfOSetInstVar) /* 9 */
 #endif
 #ifndef NsfOGetInstVar
 #define NsfOGetInstVar \
-	(nsfStubsPtr->nsfOGetInstVar) /* 16 */
+	(nsfStubsPtr->nsfOGetInstVar) /* 10 */
 #endif
-/* Slot 17 is reserved */
-/* Slot 18 is reserved */
 #ifndef Nsf_ObjSetVar2
 #define Nsf_ObjSetVar2 \
-	(nsfStubsPtr->nsf_ObjSetVar2) /* 19 */
+	(nsfStubsPtr->nsf_ObjSetVar2) /* 11 */
 #endif
 #ifndef Nsf_ObjGetVar2
 #define Nsf_ObjGetVar2 \
-	(nsfStubsPtr->nsf_ObjGetVar2) /* 20 */
+	(nsfStubsPtr->nsf_ObjGetVar2) /* 12 */
 #endif
 #ifndef NsfUnsetInstVar2
 #define NsfUnsetInstVar2 \
-	(nsfStubsPtr->nsfUnsetInstVar2) /* 21 */
+	(nsfStubsPtr->nsfUnsetInstVar2) /* 13 */
 #endif
-/* Slot 22 is reserved */
 #ifndef NsfErrMsg
 #define NsfErrMsg \
-	(nsfStubsPtr->nsfErrMsg) /* 23 */
+	(nsfStubsPtr->nsfErrMsg) /* 14 */
 #endif
 #ifndef NsfVarErrMsg
 #define NsfVarErrMsg \
-	(nsfStubsPtr->nsfVarErrMsg) /* 24 */
+	(nsfStubsPtr->nsfVarErrMsg) /* 15 */
 #endif
 #ifndef NsfErrInProc
 #define NsfErrInProc \
-	(nsfStubsPtr->nsfErrInProc) /* 25 */
+	(nsfStubsPtr->nsfErrInProc) /* 16 */
 #endif
-/* Slot 26 is reserved */
 #ifndef NsfErrBadVal_
 #define NsfErrBadVal_ \
-	(nsfStubsPtr->nsfErrBadVal_) /* 27 */
+	(nsfStubsPtr->nsfErrBadVal_) /* 17 */
 #endif
 #ifndef NsfObjErrType
 #define NsfObjErrType \
-	(nsfStubsPtr->nsfObjErrType) /* 28 */
+	(nsfStubsPtr->nsfObjErrType) /* 18 */
 #endif
 #ifndef NsfStackDump
 #define NsfStackDump \
-	(nsfStubsPtr->nsfStackDump) /* 29 */
+	(nsfStubsPtr->nsfStackDump) /* 19 */
 #endif
-/* Slot 30 is reserved */
-/* Slot 31 is reserved */
 #ifndef NsfSetObjClientData
 #define NsfSetObjClientData \
-	(nsfStubsPtr->nsfSetObjClientData) /* 32 */
+	(nsfStubsPtr->nsfSetObjClientData) /* 20 */
 #endif
 #ifndef NsfGetObjClientData
 #define NsfGetObjClientData \
-	(nsfStubsPtr->nsfGetObjClientData) /* 33 */
+	(nsfStubsPtr->nsfGetObjClientData) /* 21 */
 #endif
 #ifndef NsfSetClassClientData
 #define NsfSetClassClientData \
-	(nsfStubsPtr->nsfSetClassClientData) /* 34 */
+	(nsfStubsPtr->nsfSetClassClientData) /* 22 */
 #endif
 #ifndef NsfGetClassClientData
 #define NsfGetClassClientData \
-	(nsfStubsPtr->nsfGetClassClientData) /* 35 */
+	(nsfStubsPtr->nsfGetClassClientData) /* 23 */
 #endif
 #ifndef NsfRequireObjNamespace
 #define NsfRequireObjNamespace \
-	(nsfStubsPtr->nsfRequireObjNamespace) /* 36 */
+	(nsfStubsPtr->nsfRequireObjNamespace) /* 24 */
 #endif
 #ifndef NsfErrBadVal
 #define NsfErrBadVal \
-	(nsfStubsPtr->nsfErrBadVal) /* 37 */
+	(nsfStubsPtr->nsfErrBadVal) /* 25 */
 #endif
 #ifndef NsfNextObjCmd
 #define NsfNextObjCmd \
-	(nsfStubsPtr->nsfNextObjCmd) /* 38 */
+	(nsfStubsPtr->nsfNextObjCmd) /* 26 */
 #endif
 #ifndef NsfCallMethodWithArgs
 #define NsfCallMethodWithArgs \
-	(nsfStubsPtr->nsfCallMethodWithArgs) /* 39 */
+	(nsfStubsPtr->nsfCallMethodWithArgs) /* 27 */
 #endif
 #ifndef NsfObjErrArgCnt
 #define NsfObjErrArgCnt \
-	(nsfStubsPtr->nsfObjErrArgCnt) /* 40 */
+	(nsfStubsPtr->nsfObjErrArgCnt) /* 28 */
 #endif
 #ifndef NsfAddObjectMethod
 #define NsfAddObjectMethod \
-	(nsfStubsPtr->nsfAddObjectMethod) /* 41 */
+	(nsfStubsPtr->nsfAddObjectMethod) /* 29 */
 #endif
 #ifndef NsfAddClassMethod
 #define NsfAddClassMethod \
-	(nsfStubsPtr->nsfAddClassMethod) /* 42 */
+	(nsfStubsPtr->nsfAddClassMethod) /* 30 */
 #endif
 #ifndef NsfCreate
 #define NsfCreate \
-	(nsfStubsPtr->nsfCreate) /* 43 */
+	(nsfStubsPtr->nsfCreate) /* 31 */
 #endif
 
 #endif /* defined(USE_NSF_STUBS) && !defined(USE_NSF_STUB_PROCS) */
Index: generic/nsfInt.decls
===================================================================
diff -u -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r14965323980c2235c37b67ddbb19343ddbdaa41c
--- generic/nsfInt.decls	(.../nsfInt.decls)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
+++ generic/nsfInt.decls	(.../nsfInt.decls)	(revision 14965323980c2235c37b67ddbb19343ddbdaa41c)
@@ -27,91 +27,4 @@
 #declare 1 generic {
 
 #}
-# declare 2 generic {
-#     int NsfErrInProc (Tcl_Interp *in, Tcl_Obj* objName,
-# 		Tcl_Obj* clName, char* procName)
-# }
-# declare 3 generic {
-#     int NsfObjErrArgCnt(Tcl_Interp *in, Tcl_Obj *cmdname, char *arglist)
-# }
-# declare 4 generic {
-#     int NsfErrBadVal(Tcl_Interp *in, char *expected, char *value)
-# }
-# declare 5 generic {
-#     int NsfObjErrType(Tcl_Interp *in, Tcl_Obj *nm, char* wt)
-# }
-# declare 6 generic {
-#     void NsfStackTrace (Tcl_Interp* in)
-# }
-# declare 7 generic {
-#     void NsfCallStackTrace (Tcl_Interp* in)
-# }
-#declare 8 generic {
-#    void NsfFilterTrace (Tcl_Interp* in)
-#}
-#declare 9 generic {
-#    int NsfIsType(NsfObject* obj, NsfClass* type)
-#}
-#declare 10 generic {
-#    void NsfRemoveClasses(NsfClasses* sl)
-#}
-# declare 11 generic {
-#     NsfClasses** NsfAddClass(NsfClasses** cList, NsfClass* cl, ClientData cd)
-# }
-# declare 12 generic {
 
-# }
-# declare 13 generic {
-#     NsfClasses* NsfComputeDependents(register NsfClass* cl)
-# }
-# declare 14 generic {
-#     void NsfDeprecatedMsg(char* oldCmd, char* newCmd)
-# }
-# declare 15 generic {
-#     void NsfSetObjClientData(NsfObject* obj, ClientData data)
-# }
-# declare 16 generic {
-#     ClientData NsfGetObjClientData(NsfObject* obj)
-# }
-# declare 17 generic {
-#     void NsfSetClassClientData(NsfClass* cl, ClientData data)
-# }
-# declare 18 generic {
-#     ClientData NsfGetClassClientData(NsfClass* cl)
-# }
-# declare 19 generic {
-#     void NsfRequireObjectOpt(NsfObject* obj)
-# }
-# declare 20 generic {
-#     void NsfRequireClassOpt(NsfClass* cl)
-# }
-# declare 21 generic {
-#     void NsfRequireObjNamespace(Tcl_Interp* in, NsfObject* obj)
-# }
-# declare 22 generic {
-    
-# }
-# declare 23 generic {
-    
-# }
-# declare 24 generic {
-    
-# }
-# declare 25 generic {
-    
-# }
-# declare 26 generic {
-    
-# }
-# declare 27 generic {
-    
-# }
-# declare 28 generic {
-    
-# }
-# declare 29 generic {
-    
-# }
-# declare 30 generic {
-    
-# }
Index: generic/nsfInt.h
===================================================================
diff -u -r0d35d1ccd86f2b72296ff01d0d83747ca1c0de65 -r14965323980c2235c37b67ddbb19343ddbdaa41c
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 0d35d1ccd86f2b72296ff01d0d83747ca1c0de65)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 14965323980c2235c37b67ddbb19343ddbdaa41c)
@@ -347,7 +347,6 @@
 /* deletion state */
 #define NSF_TCL_DELETE                     0x0400
 #define NSF_DESTROY_CALLED_SUCCESS         0x0800
-/*#define NSF_CMD_NOT_FOUND                  0x1000*/
 #define NSF_DURING_DELETE                  0x2000
 #define NSF_DELETED                        0x4000
 #define NSF_RECREATE                       0x8000
Index: generic/nsfStubInit.c
===================================================================
diff -u -r8eddf67371ec031084a6ef98fdec21e38dff85ff -r14965323980c2235c37b67ddbb19343ddbdaa41c
--- generic/nsfStubInit.c	(.../nsfStubInit.c)	(revision 8eddf67371ec031084a6ef98fdec21e38dff85ff)
+++ generic/nsfStubInit.c	(.../nsfStubInit.c)	(revision 14965323980c2235c37b67ddbb19343ddbdaa41c)
@@ -39,47 +39,35 @@
     Nsf_Init, /* 0 */
     NULL, /* 1 */
     NsfIsClass, /* 2 */
-    NULL, /* 3 */
-    NsfGetObject, /* 4 */
-    NsfGetClass, /* 5 */
-    NsfCreateObject, /* 6 */
-    NULL, /* 7 */
-    NULL, /* 8 */
-    NsfDeleteObject, /* 9 */
-    NULL, /* 10 */
-    NULL, /* 11 */
-    NULL, /* 12 */
-    NsfRemoveObjectMethod, /* 13 */
-    NsfRemoveClassMethod, /* 14 */
-    NsfOSetInstVar, /* 15 */
-    NsfOGetInstVar, /* 16 */
-    NULL, /* 17 */
-    NULL, /* 18 */
-    Nsf_ObjSetVar2, /* 19 */
-    Nsf_ObjGetVar2, /* 20 */
-    NsfUnsetInstVar2, /* 21 */
-    NULL, /* 22 */
-    NsfErrMsg, /* 23 */
-    NsfVarErrMsg, /* 24 */
-    NsfErrInProc, /* 25 */
-    NULL, /* 26 */
-    NsfErrBadVal_, /* 27 */
-    NsfObjErrType, /* 28 */
-    NsfStackDump, /* 29 */
-    NULL, /* 30 */
-    NULL, /* 31 */
-    NsfSetObjClientData, /* 32 */
-    NsfGetObjClientData, /* 33 */
-    NsfSetClassClientData, /* 34 */
-    NsfGetClassClientData, /* 35 */
-    NsfRequireObjNamespace, /* 36 */
-    NsfErrBadVal, /* 37 */
-    NsfNextObjCmd, /* 38 */
-    NsfCallMethodWithArgs, /* 39 */
-    NsfObjErrArgCnt, /* 40 */
-    NsfAddObjectMethod, /* 41 */
-    NsfAddClassMethod, /* 42 */
-    NsfCreate, /* 43 */
+    NsfGetObject, /* 3 */
+    NsfGetClass, /* 4 */
+    NsfCreateObject, /* 5 */
+    NsfDeleteObject, /* 6 */
+    NsfRemoveObjectMethod, /* 7 */
+    NsfRemoveClassMethod, /* 8 */
+    NsfOSetInstVar, /* 9 */
+    NsfOGetInstVar, /* 10 */
+    Nsf_ObjSetVar2, /* 11 */
+    Nsf_ObjGetVar2, /* 12 */
+    NsfUnsetInstVar2, /* 13 */
+    NsfErrMsg, /* 14 */
+    NsfVarErrMsg, /* 15 */
+    NsfErrInProc, /* 16 */
+    NsfErrBadVal_, /* 17 */
+    NsfObjErrType, /* 18 */
+    NsfStackDump, /* 19 */
+    NsfSetObjClientData, /* 20 */
+    NsfGetObjClientData, /* 21 */
+    NsfSetClassClientData, /* 22 */
+    NsfGetClassClientData, /* 23 */
+    NsfRequireObjNamespace, /* 24 */
+    NsfErrBadVal, /* 25 */
+    NsfNextObjCmd, /* 26 */
+    NsfCallMethodWithArgs, /* 27 */
+    NsfObjErrArgCnt, /* 28 */
+    NsfAddObjectMethod, /* 29 */
+    NsfAddClassMethod, /* 30 */
+    NsfCreate, /* 31 */
 };
 
 /* !END!: Do not edit above this line. */