Index: generic/nsf.decls
===================================================================
diff -u -r87c6a11296ada89c007cc2ed33df6887ac53c740 -r9be296c7be8b0c04eaedd9f96c36d626aa7c2c97
--- generic/nsf.decls	(.../nsf.decls)	(revision 87c6a11296ada89c007cc2ed33df6887ac53c740)
+++ generic/nsf.decls	(.../nsf.decls)	(revision 9be296c7be8b0c04eaedd9f96c36d626aa7c2c97)
@@ -28,100 +28,85 @@
 #    int Nsf_SafeInit(Tcl_Interp *interp)
 #}
 declare 2 generic {
-    struct Nsf_Class *NsfIsClass(Tcl_Interp *interp, ClientData cd)
+  struct Nsf_Class *NsfIsClass(Tcl_Interp *interp, ClientData cd)
 }
 declare 3 generic {
-    struct Nsf_Object *NsfGetObject(Tcl_Interp *interp, CONST char *name)
+  struct Nsf_Object *NsfGetObject(Tcl_Interp *interp, CONST char *name)
 }
 declare 4 generic {
-    struct Nsf_Class *NsfGetClass(Tcl_Interp *interp, CONST char *name)
+  struct Nsf_Class *NsfGetClass(Tcl_Interp *interp, CONST char *name)
 }
 declare 5 generic {
-    int NsfCreateObject(Tcl_Interp *interp, Tcl_Obj *name, struct Nsf_Class *cl)
+  int NsfDeleteObject(Tcl_Interp *interp, struct Nsf_Object *obj)
 }
 declare 6 generic {
-    int NsfDeleteObject(Tcl_Interp *interp, struct Nsf_Object *obj)
+  int NsfRemoveObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, CONST char *nm)
 }
 declare 7 generic {
-    int NsfRemoveObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, CONST char *nm)
+  int NsfRemoveClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm)
 }
 declare 8 generic {
-    int NsfRemoveClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, CONST char *nm)
+  Tcl_Obj *Nsf_ObjSetVar2(struct Nsf_Object *obj,
+			  Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2,
+			  Tcl_Obj *value, int flgs)
 }
 declare 9 generic {
-    Tcl_Obj *NsfOSetInstVar(struct Nsf_Object *obj, Tcl_Interp *interp,
-			    Tcl_Obj *name, Tcl_Obj *value, int flgs)
+  Tcl_Obj *Nsf_ObjGetVar2(struct Nsf_Object *obj, 
+			  Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2,
+			  int flgs)
 }
 declare 10 generic {
-    Tcl_Obj *NsfOGetInstVar(struct Nsf_Object *obj, Tcl_Interp *interp,
-			    Tcl_Obj *name, int flgs)
+  int Nsf_UnsetVar2(struct Nsf_Object *obj, Tcl_Interp *interp, 
+		    CONST char *name1, CONST char *name2, int flgs)
 }
 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)
+  void NsfDStringPrintf(Tcl_DString *dsPtr, CONST char *fmt, va_list apSrc)
 }
 declare 12 generic {
-    Tcl_Obj *Nsf_ObjGetVar2(struct Nsf_Object *obj, 
-			    Tcl_Interp *interp, Tcl_Obj *name1, Tcl_Obj *name2,
-			    int flgs)
+  int NsfPrintError(Tcl_Interp *interp, CONST char *fmt, ...)
 }
 declare 13 generic {
-    int NsfUnsetInstVar2(struct Nsf_Object *obj, Tcl_Interp *interp, 
-			 CONST char *name1, CONST char *name2, 
-			 int flgs)
+  int NsfErrInProc (Tcl_Interp *interp, Tcl_Obj *objName,
+		    Tcl_Obj *clName, CONST char *procName)
 }
 declare 14 generic {
-    void NsfDStringPrintf(Tcl_DString *dsPtr, CONST char *fmt, va_list apSrc)
+  int NsfObjErrType(Tcl_Interp *interp, CONST char *context, 
+		    Tcl_Obj *value, CONST char *type, Nsf_Param CONST *pPtr)
 }
 declare 15 generic {
-    int NsfPrintError(Tcl_Interp *interp, CONST char *fmt, ...)
+  void NsfStackDump (Tcl_Interp *interp)
 }
 declare 16 generic {
-    int NsfErrInProc (Tcl_Interp *interp, Tcl_Obj *objName,
-		      Tcl_Obj *clName, CONST char *procName)
+  void NsfSetObjClientData(Nsf_Object *obj, ClientData data)
 }
 declare 17 generic {
-    int NsfObjErrType(Tcl_Interp *interp, CONST char *context, 
-		      Tcl_Obj *value, CONST char *type, Nsf_Param CONST *pPtr)
+  ClientData NsfGetObjClientData(Nsf_Object *obj)
 }
 declare 18 generic {
-    void NsfStackDump (Tcl_Interp *interp)
+  void NsfSetClassClientData(Nsf_Class *cl, ClientData data)
 }
 declare 19 generic {
-    void NsfSetObjClientData(Nsf_Object *obj, ClientData data)
+  ClientData NsfGetClassClientData(Nsf_Class *cl)
 }
 declare 20 generic {
-    ClientData NsfGetObjClientData(Nsf_Object *obj)
+  void NsfRequireObjNamespace(Tcl_Interp *interp, Nsf_Object *obj)
 }
 declare 21 generic {
-    void NsfSetClassClientData(Nsf_Class *cl, ClientData data)
+  int  NsfCallMethodWithArgs(ClientData cd, Tcl_Interp *interp, 
+			     Tcl_Obj *method, Tcl_Obj *arg,
+			     int objc, Tcl_Obj *CONST objv[], int flags)
 }
 declare 22 generic {
-    ClientData NsfGetClassClientData(Nsf_Class *cl)
+  int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, 
+                         CONST char *nm, Tcl_ObjCmdProc *proc,
+	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
 declare 23 generic {
-    void NsfRequireObjNamespace(Tcl_Interp *interp, Nsf_Object *obj)
+  int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, 
+			CONST char *nm, Tcl_ObjCmdProc *proc,
+			ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
 }
 declare 24 generic {
-        int NsfNextObjCmd(ClientData cd, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+  int NsfCreate(Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, 
+		int objc, Tcl_Obj *CONST objv[])
 }
-declare 25 generic {
-        int  NsfCallMethodWithArgs(ClientData cd, Tcl_Interp *interp, 
-                Tcl_Obj *method, Tcl_Obj *arg,
-       	         int objc, Tcl_Obj *CONST objv[], int flags)
-}
-declare 26 generic {
-    int NsfAddObjectMethod(Tcl_Interp *interp, struct Nsf_Object *obj, 
-                         CONST char *nm, Tcl_ObjCmdProc *proc,
-	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
-}
-declare 27 generic {
-   int NsfAddClassMethod(Tcl_Interp *interp, struct Nsf_Class *cl, 
-                         CONST char *nm, Tcl_ObjCmdProc *proc,
-	                 ClientData cd, Tcl_CmdDeleteProc *dp, int flags)
-}
-declare 28 generic {
-    int NsfCreate(Tcl_Interp *in, Nsf_Class *class, Tcl_Obj *name, ClientData data,
-		  int objc, Tcl_Obj *CONST objv[])
-}