Index: generic/nsfInt.h
===================================================================
diff -u -rd884e8166428ad9dae6c39cb16c8324953b69b11 -r70d242f602e1807f7ef67cf9d642bb78f059be44
--- generic/nsfInt.h	(.../nsfInt.h)	(revision d884e8166428ad9dae6c39cb16c8324953b69b11)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 70d242f602e1807f7ef67cf9d642bb78f059be44)
@@ -370,13 +370,22 @@
 #define NSF_ARG_IS_CONVERTER		0x2000
 #define NSF_ARG_IS_ENUMERATION		0x4000
 
-/* disallowed options */
+/* Disallowed parameter options */
 #define NSF_DISALLOWED_ARG_METHOD_PARAMETER	     (NSF_ARG_METHOD|NSF_ARG_INITCMD|NSF_ARG_RELATION)
 #define NSF_DISALLOWED_ARG_SETTER	     	     (NSF_ARG_SUBST_DEFAULT|NSF_DISALLOWED_ARG_METHOD_PARAMETER)
 #define NSF_DISALLOWED_ARG_OBJECT_PARAMETER	     0
 #define NSF_DISALLOWED_ARG_VALUECHECK	     (NSF_ARG_SUBST_DEFAULT|NSF_ARG_METHOD|NSF_ARG_INITCMD|NSF_ARG_RELATION|NSF_ARG_SWITCH|NSF_ARG_CURRENTLY_UNKNOWN)
 
 
+/* flags for ParseContext */
+#define NSF_PC_MUST_DECR		     0x0001
+#define NSF_PC_IS_DEFAULT		     0x0002
+
+#define NSF_PC_STATUS_MUST_DECR		     0x0001
+#define NSF_PC_STATUS_FREE_OBJV		     0x0002
+#define NSF_PC_STATUS_FREE_CD		     0x0004
+
+
 /* method types */
 #define NSF_METHODTYPE_ALIAS     0x0001
 #define NSF_METHODTYPE_SCRIPTED  0x0002
@@ -387,13 +396,7 @@
 #define NSF_METHODTYPE_BUILTIN   NSF_METHODTYPE_ALIAS|NSF_METHODTYPE_SETTER|NSF_METHODTYPE_FORWARDER|NSF_METHODTYPE_OTHER
 #define NSF_METHODTYPE_ALL       NSF_METHODTYPE_SCRIPTED|NSF_METHODTYPE_BUILTIN|NSF_METHODTYPE_OBJECT
 
-/* flags for ParseContext */
-#define NSF_PC_MUST_DECR		     0x0001
 
-#define NSF_PC_STATUS_MUST_DECR		     0x0001
-#define NSF_PC_STATUS_FREE_OBJV		     0x0002
-#define NSF_PC_STATUS_FREE_CD		     0x0004
-
 #define NsfObjectSetClass(obj) \
 	(obj)->flags |= NSF_IS_CLASS
 #define NsfObjectClearClass(obj) \