Index: generic/nsfAPI.h
===================================================================
diff -u -N -r75383021cb9f2f2db883583779a02eef6f1801f5 -r6ff78ef39ca727100ca57bd915e5632da6e89454
--- generic/nsfAPI.h	(.../nsfAPI.h)	(revision 75383021cb9f2f2db883583779a02eef6f1801f5)
+++ generic/nsfAPI.h	(.../nsfAPI.h)	(revision 6ff78ef39ca727100ca57bd915e5632da6e89454)
@@ -1,6 +1,6 @@
 
 /*
- * This source code file was generated by the C-code generator gentclAPI.tcl, 
+ * This source code file was generated by the C-code generator gentclAPI.tcl,
  * part of the Next Scripting Framework.
  */
 
@@ -49,10 +49,10 @@
 #endif
 
 
-#if !defined(likely) 
+#if !defined(likely)
 # if defined(__GNUC__) && __GNUC__ > 2
 /* Use gcc branch prediction hint to minimize cost of e.g. DTrace
- * ENABLED checks. 
+ * ENABLED checks.
  */
 #  define unlikely(x) (__builtin_expect((x), 0))
 #  define likely(x) (__builtin_expect((x), 1))
@@ -66,7 +66,7 @@
 
 enum InfomethodsubcmdIdx {InfomethodsubcmdNULL, InfomethodsubcmdArgsIdx, InfomethodsubcmdBodyIdx, InfomethodsubcmdDefinitionIdx, InfomethodsubcmdExistsIdx, InfomethodsubcmdRegistrationhandleIdx, InfomethodsubcmdDefinitionhandleIdx, InfomethodsubcmdOriginIdx, InfomethodsubcmdParameterIdx, InfomethodsubcmdSyntaxIdx, InfomethodsubcmdTypeIdx, InfomethodsubcmdPreconditionIdx, InfomethodsubcmdPostconditionIdx, InfomethodsubcmdSubmethodsIdx, InfomethodsubcmdReturnsIdx};
 
-static int ConvertToInfomethodsubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToInfomethodsubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"args", "body", "definition", "exists", "registrationhandle", "definitionhandle", "origin", "parameter", "syntax", "type", "precondition", "postcondition", "submethods", "returns", NULL};
@@ -79,7 +79,7 @@
   
 enum CallprotectionIdx {CallprotectionNULL, CallprotectionAllIdx, CallprotectionPublicIdx, CallprotectionProtectedIdx, CallprotectionPrivateIdx};
 
-static int ConvertToCallprotection(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToCallprotection(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"all", "public", "protected", "private", NULL};
@@ -92,7 +92,7 @@
   
 enum MethodtypeIdx {MethodtypeNULL, MethodtypeAllIdx, MethodtypeScriptedIdx, MethodtypeBuiltinIdx, MethodtypeAliasIdx, MethodtypeForwarderIdx, MethodtypeObjectIdx, MethodtypeSetterIdx, MethodtypeNsfprocIdx};
 
-static int ConvertToMethodtype(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToMethodtype(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"all", "scripted", "builtin", "alias", "forwarder", "object", "setter", "nsfproc", NULL};
@@ -105,7 +105,7 @@
   
 enum SourceIdx {SourceNULL, SourceAllIdx, SourceApplicationIdx, SourceSystemIdx};
 
-static int ConvertToSource(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToSource(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"all", "application", "system", NULL};
@@ -118,7 +118,7 @@
   
 enum ScopeIdx {ScopeNULL, ScopeAllIdx, ScopeClassIdx, ScopeObjectIdx};
 
-static int ConvertToScope(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToScope(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"all", "class", "object", NULL};
@@ -131,7 +131,7 @@
   
 enum ConfigureoptionIdx {ConfigureoptionNULL, ConfigureoptionDebugIdx, ConfigureoptionDtraceIdx, ConfigureoptionFilterIdx, ConfigureoptionProfileIdx, ConfigureoptionSoftrecreateIdx, ConfigureoptionObjectsystemsIdx, ConfigureoptionKeepcmdsIdx, ConfigureoptionCheckresultsIdx, ConfigureoptionCheckargumentsIdx};
 
-static int ConvertToConfigureoption(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToConfigureoption(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"debug", "dtrace", "filter", "profile", "softrecreate", "objectsystems", "keepcmds", "checkresults", "checkarguments", NULL};
@@ -144,7 +144,7 @@
   
 enum CurrentoptionIdx {CurrentoptionNULL, CurrentoptionProcIdx, CurrentoptionMethodIdx, CurrentoptionMethodpathIdx, CurrentoptionObjectIdx, CurrentoptionClassIdx, CurrentoptionActivelevelIdx, CurrentoptionArgsIdx, CurrentoptionActivemixinIdx, CurrentoptionCalledprocIdx, CurrentoptionCalledmethodIdx, CurrentoptionCalledclassIdx, CurrentoptionCallingprocIdx, CurrentoptionCallingmethodIdx, CurrentoptionCallingclassIdx, CurrentoptionCallinglevelIdx, CurrentoptionCallingobjectIdx, CurrentoptionFilterregIdx, CurrentoptionIsnextcallIdx, CurrentoptionNextmethodIdx};
 
-static int ConvertToCurrentoption(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToCurrentoption(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"proc", "method", "methodpath", "object", "class", "activelevel", "args", "activemixin", "calledproc", "calledmethod", "calledclass", "callingproc", "callingmethod", "callingclass", "callinglevel", "callingobject", "filterreg", "isnextcall", "nextmethod", NULL};
@@ -157,7 +157,7 @@
   
 enum FrameIdx {FrameNULL, FrameMethodIdx, FrameObjectIdx, FrameDefaultIdx};
 
-static int ConvertToFrame(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToFrame(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"method", "object", "default", NULL};
@@ -170,7 +170,7 @@
   
 enum AssertionsubcmdIdx {AssertionsubcmdNULL, AssertionsubcmdCheckIdx, AssertionsubcmdObject_invarIdx, AssertionsubcmdClass_invarIdx};
 
-static int ConvertToAssertionsubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToAssertionsubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"check", "object-invar", "class-invar", NULL};
@@ -183,7 +183,7 @@
   
 enum MethodpropertyIdx {MethodpropertyNULL, MethodpropertyClass_onlyIdx, MethodpropertyCall_privateIdx, MethodpropertyCall_protectedIdx, MethodpropertyRedefine_protectedIdx, MethodpropertyReturnsIdx, MethodpropertySlotobjIdx};
 
-static int ConvertToMethodproperty(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToMethodproperty(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"class-only", "call-private", "call-protected", "redefine-protected", "returns", "slotobj", NULL};
@@ -196,7 +196,7 @@
   
 enum ObjectpropertyIdx {ObjectpropertyNULL, ObjectpropertyInitializedIdx, ObjectpropertyClassIdx, ObjectpropertyRootmetaclassIdx, ObjectpropertyRootclassIdx, ObjectpropertyVolatileIdx, ObjectpropertySlotcontainerIdx, ObjectpropertyHasperobjectslotsIdx, ObjectpropertyKeepcallerselfIdx, ObjectpropertyPerobjectdispatchIdx};
 
-static int ConvertToObjectproperty(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToObjectproperty(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"initialized", "class", "rootmetaclass", "rootclass", "volatile", "slotcontainer", "hasperobjectslots", "keepcallerself", "perobjectdispatch", NULL};
@@ -209,7 +209,7 @@
   
 enum ParametersubcmdIdx {ParametersubcmdNULL, ParametersubcmdDefaultIdx, ParametersubcmdListIdx, ParametersubcmdNameIdx, ParametersubcmdSyntaxIdx, ParametersubcmdTypeIdx};
 
-static int ConvertToParametersubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToParametersubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"default", "list", "name", "syntax", "type", NULL};
@@ -222,7 +222,7 @@
   
 enum RelationtypeIdx {RelationtypeNULL, RelationtypeObject_mixinIdx, RelationtypeClass_mixinIdx, RelationtypeObject_filterIdx, RelationtypeClass_filterIdx, RelationtypeClassIdx, RelationtypeSuperclassIdx, RelationtypeRootclassIdx};
 
-static int ConvertToRelationtype(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToRelationtype(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"object-mixin", "class-mixin", "object-filter", "class-filter", "class", "superclass", "rootclass", NULL};
@@ -235,7 +235,7 @@
   
 enum ObjectkindIdx {ObjectkindNULL, ObjectkindClassIdx, ObjectkindBaseclassIdx, ObjectkindMetaclassIdx};
 
-static int ConvertToObjectkind(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToObjectkind(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"class", "baseclass", "metaclass", NULL};
@@ -248,7 +248,7 @@
   
 enum InfoobjectparametersubcmdIdx {InfoobjectparametersubcmdNULL, InfoobjectparametersubcmdDefinitionsIdx, InfoobjectparametersubcmdListIdx, InfoobjectparametersubcmdNamesIdx, InfoobjectparametersubcmdSyntaxIdx};
 
-static int ConvertToInfoobjectparametersubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr, 
+static int ConvertToInfoobjectparametersubcmd(Tcl_Interp *interp, Tcl_Obj *objPtr, Nsf_Param CONST *pPtr,
 			    ClientData *clientData, Tcl_Obj **outObjPtr) {
   int index, result;
   static CONST char *opts[] = {"definitions", "list", "names", "syntax", NULL};
@@ -855,9 +855,9 @@
     
 
       if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfCAllocMethodIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfCAllocMethod(interp, cl, objv[1]);
@@ -872,8 +872,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfCCreateMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfCCreateMethodIdx].paramDefs,
                      method_definitions[NsfCCreateMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     Tcl_Obj *objectName = (Tcl_Obj *)pc.clientData[0];
@@ -896,9 +896,9 @@
     
 
       if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfCDeallocMethodIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfCDeallocMethod(interp, cl, objv[1]);
@@ -913,8 +913,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfCFilterGuardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfCFilterGuardMethodIdx].paramDefs,
                      method_definitions[NsfCFilterGuardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *filter = (CONST char *)pc.clientData[0];
@@ -938,10 +938,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfCGetCachendParametersMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfCGetCachendParametersMethod(interp, cl);
 
@@ -955,8 +955,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfCMixinGuardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfCMixinGuardMethodIdx].paramDefs,
                      method_definitions[NsfCMixinGuardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     Tcl_Obj *mixin = (Tcl_Obj *)pc.clientData[0];
@@ -978,8 +978,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfCNewMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfCNewMethodIdx].paramDefs,
                      method_definitions[NsfCNewMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     Tcl_Obj *withChildof = (Tcl_Obj *)pc.clientData[0];
@@ -1000,8 +1000,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfCRecreateMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfCRecreateMethodIdx].paramDefs,
                      method_definitions[NsfCRecreateMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     Tcl_Obj *objectName = (Tcl_Obj *)pc.clientData[0];
@@ -1024,9 +1024,9 @@
     
 
       if (objc < 1 || objc > 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfCSuperclassMethodIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfCSuperclassMethod(interp, cl, objc == 2 ? objv[1] : NULL);
@@ -1041,8 +1041,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoFilterguardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoFilterguardMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoFilterguardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *filter = (CONST char *)pc.clientData[0];
@@ -1063,8 +1063,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoFiltermethodsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoFiltermethodsMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoFiltermethodsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withGuards = (int )PTR2INT(pc.clientData[0]);
@@ -1086,8 +1086,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoForwardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoForwardMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoForwardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withDefinition = (int )PTR2INT(pc.clientData[0]);
@@ -1109,8 +1109,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoHeritageMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoHeritageMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoHeritageMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *pattern = (CONST char *)pc.clientData[0];
@@ -1131,8 +1131,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoInstancesMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoInstancesMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoInstancesMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withClosure = (int )PTR2INT(pc.clientData[0]);
@@ -1168,8 +1168,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoMethodMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoMethodMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoMethodMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int subcmd = (int )PTR2INT(pc.clientData[0]);
@@ -1191,8 +1191,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoMethodsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoMethodsMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoMethodsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withCallprotection = (int )PTR2INT(pc.clientData[0]);
@@ -1218,8 +1218,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoMixinOfMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoMixinOfMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoMixinOfMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withClosure = (int )PTR2INT(pc.clientData[0]);
@@ -1256,8 +1256,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoMixinclassesMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoMixinclassesMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoMixinclassesMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withClosure = (int )PTR2INT(pc.clientData[0]);
@@ -1295,8 +1295,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoMixinguardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoMixinguardMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoMixinguardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *mixin = (CONST char *)pc.clientData[0];
@@ -1317,8 +1317,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoSlotobjectsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoSlotobjectsMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoSlotobjectsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withClosure = (int )PTR2INT(pc.clientData[0]);
@@ -1342,8 +1342,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoSubclassMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoSubclassMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoSubclassMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withClosure = (int )PTR2INT(pc.clientData[0]);
@@ -1380,8 +1380,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(cl == NULL)) return NsfDispatchClientDataError(interp, clientData, "class", ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0], 
-                     method_definitions[NsfClassInfoSuperclassMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, (NsfObject *) cl, objv[0],
+                     method_definitions[NsfClassInfoSuperclassMethodIdx].paramDefs,
                      method_definitions[NsfClassInfoSuperclassMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withClosure = (int )PTR2INT(pc.clientData[0]);
@@ -1400,8 +1400,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfAsmMethodCreateCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfAsmMethodCreateCmdIdx].paramDefs,
                      method_definitions[NsfAsmMethodCreateCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1426,8 +1426,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfAsmProcCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfAsmProcCmdIdx].paramDefs,
                      method_definitions[NsfAsmProcCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withAd = (int )PTR2INT(pc.clientData[0]);
@@ -1449,8 +1449,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfCmdInfoCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfCmdInfoCmdIdx].paramDefs,
                      method_definitions[NsfCmdInfoCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int subcmd = (int )PTR2INT(pc.clientData[0]);
@@ -1481,8 +1481,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfConfigureCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfConfigureCmdIdx].paramDefs,
                      method_definitions[NsfConfigureCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int option = (int )PTR2INT(pc.clientData[0]);
@@ -1501,8 +1501,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfCurrentCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfCurrentCmdIdx].paramDefs,
                      method_definitions[NsfCurrentCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int option = (int )PTR2INT(pc.clientData[0]);
@@ -1522,10 +1522,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfDebugCompileEpochIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfDebugCompileEpoch(interp);
 
@@ -1538,10 +1538,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfDebugRunAssertionsCmdIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfDebugRunAssertionsCmd(interp);
 
@@ -1554,9 +1554,9 @@
     
 
       if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfDebugShowObjIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfDebugShowObj(interp, objv[1]);
@@ -1568,8 +1568,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfDirectDispatchCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfDirectDispatchCmdIdx].paramDefs,
                      method_definitions[NsfDirectDispatchCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1589,8 +1589,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfDispatchCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfDispatchCmdIdx].paramDefs,
                      method_definitions[NsfDispatchCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1611,8 +1611,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfFinalizeCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfFinalizeCmdIdx].paramDefs,
                      method_definitions[NsfFinalizeCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withKeepvars = (int )PTR2INT(pc.clientData[0]);
@@ -1630,8 +1630,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfInterpObjCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfInterpObjCmdIdx].paramDefs,
                      method_definitions[NsfInterpObjCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *name = (CONST char *)pc.clientData[0];
@@ -1649,8 +1649,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfIsCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfIsCmdIdx].paramDefs,
                      method_definitions[NsfIsCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withComplain = (int )PTR2INT(pc.clientData[0]);
@@ -1672,8 +1672,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMethodAliasCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMethodAliasCmdIdx].paramDefs,
                      method_definitions[NsfMethodAliasCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1695,8 +1695,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMethodAssertionCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMethodAssertionCmdIdx].paramDefs,
                      method_definitions[NsfMethodAssertionCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1716,8 +1716,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMethodCreateCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMethodCreateCmdIdx].paramDefs,
                      method_definitions[NsfMethodCreateCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1744,8 +1744,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMethodDeleteCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMethodDeleteCmdIdx].paramDefs,
                      method_definitions[NsfMethodDeleteCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1765,8 +1765,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMethodForwardCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMethodForwardCmdIdx].paramDefs,
                      method_definitions[NsfMethodForwardCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1793,8 +1793,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMethodPropertyCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMethodPropertyCmdIdx].paramDefs,
                      method_definitions[NsfMethodPropertyCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1818,9 +1818,9 @@
     
 
       if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfMethodRegisteredCmdIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfMethodRegisteredCmd(interp, objv[1]);
@@ -1832,8 +1832,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMethodSetterCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMethodSetterCmdIdx].paramDefs,
                      method_definitions[NsfMethodSetterCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -1853,8 +1853,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfMyCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfMyCmdIdx].paramDefs,
                      method_definitions[NsfMyCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withIntrinsic = (int )PTR2INT(pc.clientData[0]);
@@ -1875,8 +1875,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfNSCopyVarsCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfNSCopyVarsCmdIdx].paramDefs,
                      method_definitions[NsfNSCopyVarsCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     Tcl_Obj *fromNs = (Tcl_Obj *)pc.clientData[0];
@@ -1897,9 +1897,9 @@
     
 
       if (objc < 1 || objc > 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfNextCmdIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfNextCmd(interp, objc == 2 ? objv[1] : NULL);
@@ -1911,8 +1911,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfObjectAllocCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfObjectAllocCmdIdx].paramDefs,
                      method_definitions[NsfObjectAllocCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfClass *class = (NsfClass *)pc.clientData[0];
@@ -1934,9 +1934,9 @@
     
 
       if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfObjectExistsCmdIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfObjectExistsCmd(interp, objv[1]);
@@ -1948,8 +1948,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfObjectPropertyCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfObjectPropertyCmdIdx].paramDefs,
                      method_definitions[NsfObjectPropertyCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *objectName = (NsfObject *)pc.clientData[0];
@@ -1971,9 +1971,9 @@
     
 
       if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfObjectQualifyCmdIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfObjectQualifyCmd(interp, objv[1]);
@@ -1985,8 +1985,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfObjectSystemCreateCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfObjectSystemCreateCmdIdx].paramDefs,
                      method_definitions[NsfObjectSystemCreateCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     Tcl_Obj *rootClass = (Tcl_Obj *)pc.clientData[0];
@@ -2006,8 +2006,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfParameterCacheClassInvalidateCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfParameterCacheClassInvalidateCmdIdx].paramDefs,
                      method_definitions[NsfParameterCacheClassInvalidateCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfClass *class = (NsfClass *)pc.clientData[0];
@@ -2025,8 +2025,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfParameterCacheObjectInvalidateCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfParameterCacheObjectInvalidateCmdIdx].paramDefs,
                      method_definitions[NsfParameterCacheObjectInvalidateCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -2044,8 +2044,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfParameterInfoCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfParameterInfoCmdIdx].paramDefs,
                      method_definitions[NsfParameterInfoCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int subcmd = (int )PTR2INT(pc.clientData[0]);
@@ -2065,8 +2065,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfParameterSpecsCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfParameterSpecsCmdIdx].paramDefs,
                      method_definitions[NsfParameterSpecsCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withConfigure = (int )PTR2INT(pc.clientData[0]);
@@ -2086,8 +2086,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfProcCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfProcCmdIdx].paramDefs,
                      method_definitions[NsfProcCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withAd = (int )PTR2INT(pc.clientData[0]);
@@ -2111,10 +2111,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfProfileClearDataStubIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfProfileClearDataStub(interp);
 
@@ -2127,10 +2127,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfProfileGetDataStubIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfProfileGetDataStub(interp);
 
@@ -2141,8 +2141,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfRelationGetCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfRelationGetCmdIdx].paramDefs,
                      method_definitions[NsfRelationGetCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -2161,8 +2161,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfRelationSetCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfRelationSetCmdIdx].paramDefs,
                      method_definitions[NsfRelationSetCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -2184,10 +2184,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfSelfCmdIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfSelfCmd(interp);
 
@@ -2200,10 +2200,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfShowStackCmdIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfShowStackCmd(interp);
 
@@ -2216,10 +2216,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfUnsetUnknownArgsCmdIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfUnsetUnknownArgsCmd(interp);
 
@@ -2230,8 +2230,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfVarExistsCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfVarExistsCmdIdx].paramDefs,
                      method_definitions[NsfVarExistsCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withArray = (int )PTR2INT(pc.clientData[0]);
@@ -2251,8 +2251,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfVarGetCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfVarGetCmdIdx].paramDefs,
                      method_definitions[NsfVarGetCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withArray = (int )PTR2INT(pc.clientData[0]);
@@ -2272,8 +2272,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfVarImportCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfVarImportCmdIdx].paramDefs,
                      method_definitions[NsfVarImportCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfObject *object = (NsfObject *)pc.clientData[0];
@@ -2291,8 +2291,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfVarSetCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfVarSetCmdIdx].paramDefs,
                      method_definitions[NsfVarSetCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withArray = (int )PTR2INT(pc.clientData[0]);
@@ -2313,8 +2313,8 @@
   ParseContext pc;
   (void)clientData;
 
-  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0], 
-                     method_definitions[NsfVarUnsetCmdIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, NULL, objv[0],
+                     method_definitions[NsfVarUnsetCmdIdx].paramDefs,
                      method_definitions[NsfVarUnsetCmdIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withNocomplain = (int )PTR2INT(pc.clientData[0]);
@@ -2337,8 +2337,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfOAutonameMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfOAutonameMethodIdx].paramDefs,
                      method_definitions[NsfOAutonameMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withInstance = (int )PTR2INT(pc.clientData[0]);
@@ -2363,9 +2363,9 @@
     
 
       if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfOCgetMethodIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfOCgetMethod(interp, obj, objv[1]);
@@ -2382,9 +2382,9 @@
     
 
       if (objc < 1 || objc > 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfOClassMethodIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfOClassMethod(interp, obj, objc == 2 ? objv[1] : NULL);
@@ -2401,10 +2401,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfOCleanupMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfOCleanupMethod(interp, obj);
 
@@ -2418,8 +2418,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfOConfigureMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfOConfigureMethodIdx].paramDefs,
                      method_definitions[NsfOConfigureMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     
@@ -2442,10 +2442,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfODestroyMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfODestroyMethod(interp, obj);
 
@@ -2459,8 +2459,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfOExistsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfOExistsMethodIdx].paramDefs,
                      method_definitions[NsfOExistsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *varName = (CONST char *)pc.clientData[0];
@@ -2481,8 +2481,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfOFilterGuardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfOFilterGuardMethodIdx].paramDefs,
                      method_definitions[NsfOFilterGuardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *filter = (CONST char *)pc.clientData[0];
@@ -2517,8 +2517,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfOMixinGuardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfOMixinGuardMethodIdx].paramDefs,
                      method_definitions[NsfOMixinGuardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     Tcl_Obj *mixin = (Tcl_Obj *)pc.clientData[0];
@@ -2542,10 +2542,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfONoinitMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfONoinitMethod(interp, obj);
 
@@ -2561,10 +2561,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfORequireNamespaceMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfORequireNamespaceMethod(interp, obj);
 
@@ -2619,10 +2619,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfOVolatileMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfOVolatileMethod(interp, obj);
 
@@ -2636,8 +2636,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoChildrenMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoChildrenMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoChildrenMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfClass *withType = (NsfClass *)pc.clientData[0];
@@ -2661,10 +2661,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfObjInfoClassMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfObjInfoClassMethod(interp, obj);
 
@@ -2678,8 +2678,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoFilterguardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoFilterguardMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoFilterguardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *filter = (CONST char *)pc.clientData[0];
@@ -2700,8 +2700,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoFiltermethodsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoFiltermethodsMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoFiltermethodsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withGuards = (int )PTR2INT(pc.clientData[0]);
@@ -2723,8 +2723,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoForwardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoForwardMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoForwardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withDefinition = (int )PTR2INT(pc.clientData[0]);
@@ -2746,8 +2746,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoHasMixinMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoHasMixinMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoHasMixinMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfClass *class = (NsfClass *)pc.clientData[0];
@@ -2768,8 +2768,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoHasTypeMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoHasTypeMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoHasTypeMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfClass *class = (NsfClass *)pc.clientData[0];
@@ -2792,10 +2792,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfObjInfoHasnamespaceMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfObjInfoHasnamespaceMethod(interp, obj);
 
@@ -2809,8 +2809,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoIsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoIsMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoIsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int objectkind = (int )PTR2INT(pc.clientData[0]);
@@ -2831,8 +2831,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoLookupFilterMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoLookupFilterMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoLookupFilterMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *filter = (CONST char *)pc.clientData[0];
@@ -2853,8 +2853,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoLookupFiltersMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoLookupFiltersMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoLookupFiltersMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withGuards = (int )PTR2INT(pc.clientData[0]);
@@ -2878,9 +2878,9 @@
     
 
       if (objc != 2) {
-	return NsfArgumentError(interp, "wrong # of arguments:", 
+	return NsfArgumentError(interp, "wrong # of arguments:",
 			     method_definitions[NsfObjInfoLookupMethodMethodIdx].paramDefs,
-			     NULL, objv[0]); 
+			     NULL, objv[0]);
       }
     
     return NsfObjInfoLookupMethodMethod(interp, obj, objv[1]);
@@ -2895,8 +2895,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoLookupMethodsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoLookupMethodsMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoLookupMethodsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withCallprotection = (int )PTR2INT(pc.clientData[0]);
@@ -2923,8 +2923,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoLookupMixinsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoLookupMixinsMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoLookupMixinsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withGuards = (int )PTR2INT(pc.clientData[0]);
@@ -2960,8 +2960,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoLookupSlotsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoLookupSlotsMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoLookupSlotsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withSource = (int )PTR2INT(pc.clientData[0]);
@@ -2984,8 +2984,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoMethodMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoMethodMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoMethodMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int subcmd = (int )PTR2INT(pc.clientData[0]);
@@ -3007,8 +3007,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoMethodsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoMethodsMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoMethodsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withCallprotection = (int )PTR2INT(pc.clientData[0]);
@@ -3032,8 +3032,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoMixinclassesMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoMixinclassesMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoMixinclassesMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withGuards = (int )PTR2INT(pc.clientData[0]);
@@ -3069,8 +3069,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoMixinguardMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoMixinguardMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoMixinguardMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *mixin = (CONST char *)pc.clientData[0];
@@ -3093,10 +3093,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfObjInfoNameMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfObjInfoNameMethod(interp, obj);
 
@@ -3110,8 +3110,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoObjectparameterMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoObjectparameterMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoObjectparameterMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int subcmd = (int )PTR2INT(pc.clientData[0]);
@@ -3135,10 +3135,10 @@
     
 
       if (unlikely(objc != 1)) {
-	return NsfArgumentError(interp, "too many arguments:", 
+	return NsfArgumentError(interp, "too many arguments:",
 			     method_definitions[NsfObjInfoParentMethodIdx].paramDefs,
-			     NULL, objv[0]); 
-      } 
+			     NULL, objv[0]);
+      }
     
     return NsfObjInfoParentMethod(interp, obj);
 
@@ -3152,8 +3152,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoPrecedenceMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoPrecedenceMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoPrecedenceMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     int withIntrinsic = (int )PTR2INT(pc.clientData[0]);
@@ -3175,8 +3175,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoSlotobjectsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoSlotobjectsMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoSlotobjectsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     NsfClass *withType = (NsfClass *)pc.clientData[0];
@@ -3198,8 +3198,8 @@
   assert(clientData);
   assert(objc > 0);
   if (unlikely(obj == NULL)) return NsfDispatchClientDataError(interp, clientData, "object",  ObjStr(objv[0]));
-  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0], 
-                     method_definitions[NsfObjInfoVarsMethodIdx].paramDefs, 
+  if (likely(ArgumentParse(interp, objc, objv, obj, objv[0],
+                     method_definitions[NsfObjInfoVarsMethodIdx].paramDefs,
                      method_definitions[NsfObjInfoVarsMethodIdx].nrParameters, 0, NSF_ARGPARSE_BUILTIN,
                      &pc) == TCL_OK)) {
     CONST char *pattern = (CONST char *)pc.clientData[0];
@@ -3268,16 +3268,16 @@
   {"name", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::class::info::methods", NsfClassInfoMethodsMethodStub, 6, {
-  {"-callprotection", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToCallprotection, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-callprotection", NSF_ARG_IS_ENUMERATION, 1, ConvertToCallprotection, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-closure", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
-  {"-type", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToMethodtype, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-type", NSF_ARG_IS_ENUMERATION, 1, ConvertToMethodtype, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-path", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
-  {"-source", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToSource, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-source", NSF_ARG_IS_ENUMERATION, 1, ConvertToSource, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"pattern", 0, 1, Nsf_ConvertTo_String, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::class::info::mixinof", NsfClassInfoMixinOfMethodStub, 3, {
   {"-closure", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
-  {"-scope", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToScope, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-scope", NSF_ARG_IS_ENUMERATION, 1, ConvertToScope, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"pattern", 0, 1, ConvertToObjpattern, NULL,NULL,"objpattern",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::class::info::mixinclasses", NsfClassInfoMixinclassesMethodStub, 4, {
@@ -3291,14 +3291,14 @@
 },
 {"::nsf::methods::class::info::slotobjects", NsfClassInfoSlotobjectsMethodStub, 4, {
   {"-closure", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
-  {"-source", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToSource, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-source", NSF_ARG_IS_ENUMERATION, 1, ConvertToSource, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-type", 0, 1, Nsf_ConvertTo_Class, NULL,NULL,"class",NULL,NULL,NULL,NULL,NULL},
   {"pattern", 0, 1, Nsf_ConvertTo_String, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::class::info::subclass", NsfClassInfoSubclassMethodStub, 3, {
   {"-closure", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
   {"-dependent", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
-  {"pattern", 0, 1, ConvertToObjpattern, NULL,NULL,"objpattern",NULL,NULL,NULL,NULL,NULL}}
+  {"pattern", NSF_ARG_NOLEADINGDASH, 1, ConvertToObjpattern, NULL,NULL,"objpattern",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::class::info::superclass", NsfClassInfoSuperclassMethodStub, 2, {
   {"-closure", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
@@ -3335,7 +3335,7 @@
   {"value", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::current", NsfCurrentCmdStub, 1, {
-  {"option", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToCurrentoption, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
+  {"option", NSF_ARG_IS_ENUMERATION, 1, ConvertToCurrentoption, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::__db_compile_epoch", NsfDebugCompileEpochStub, 0, {
   {NULL, 0, 0, NULL, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
@@ -3348,7 +3348,7 @@
 },
 {"::nsf::directdispatch", NsfDirectDispatchCmdStub, 4, {
   {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Object, NULL,NULL,"object",NULL,NULL,NULL,NULL,NULL},
-  {"-frame", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToFrame, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-frame", NSF_ARG_IS_ENUMERATION, 1, ConvertToFrame, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"command", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"args", 0, 1, ConvertToNothing, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
@@ -3377,7 +3377,7 @@
   {"object", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Object, NULL,NULL,"object",NULL,NULL,NULL,NULL,NULL},
   {"-per-object", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
   {"methodName", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_String, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"-frame", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToFrame, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-frame", NSF_ARG_IS_ENUMERATION, 1, ConvertToFrame, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"cmdName", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::method::assertion", NsfMethodAssertionCmdStub, 3, {
@@ -3410,7 +3410,7 @@
   {"-earlybinding", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
   {"-onerror", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-prefix", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"-frame", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToFrame, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-frame", NSF_ARG_IS_ENUMERATION, 1, ConvertToFrame, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-verbose", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
   {"target", 0, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"args", 0, 1, ConvertToNothing, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
@@ -3630,20 +3630,20 @@
   {"name", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::object::info::lookupmethods", NsfObjInfoLookupMethodsMethodStub, 7, {
-  {"-callprotection", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToCallprotection, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-callprotection", NSF_ARG_IS_ENUMERATION, 1, ConvertToCallprotection, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-incontext", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
-  {"-type", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToMethodtype, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-type", NSF_ARG_IS_ENUMERATION, 1, ConvertToMethodtype, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-nomixins", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
   {"-path", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
-  {"-source", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToSource, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-source", NSF_ARG_IS_ENUMERATION, 1, ConvertToSource, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"pattern", 0, 1, Nsf_ConvertTo_String, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::object::info::lookupmixins", NsfObjInfoLookupMixinsMethodStub, 2, {
   {"-guards", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
   {"pattern", 0, 1, ConvertToObjpattern, NULL,NULL,"objpattern",NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::object::info::lookupslots", NsfObjInfoLookupSlotsMethodStub, 3, {
-  {"-source", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToSource, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-source", NSF_ARG_IS_ENUMERATION, 1, ConvertToSource, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-type", 0, 1, Nsf_ConvertTo_Class, NULL,NULL,"class",NULL,NULL,NULL,NULL,NULL},
   {"pattern", 0, 1, Nsf_ConvertTo_String, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
@@ -3652,8 +3652,8 @@
   {"name", NSF_ARG_REQUIRED, 1, Nsf_ConvertTo_Tclobj, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },
 {"::nsf::methods::object::info::methods", NsfObjInfoMethodsMethodStub, 4, {
-  {"-callprotection", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToCallprotection, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
-  {"-type", 0|NSF_ARG_IS_ENUMERATION, 1, ConvertToMethodtype, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-callprotection", NSF_ARG_IS_ENUMERATION, 1, ConvertToCallprotection, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
+  {"-type", NSF_ARG_IS_ENUMERATION, 1, ConvertToMethodtype, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL},
   {"-path", 0, 0, Nsf_ConvertTo_Boolean, NULL,NULL,"switch",NULL,NULL,NULL,NULL,NULL},
   {"pattern", 0, 1, Nsf_ConvertTo_String, NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL}}
 },