Index: generic/nsfInt.h
===================================================================
diff -u -r9ae451a203a43950611411ccb52efed5263a4031 -r5a2b98270f0610fb37a23436687cf2468f0d8936
--- generic/nsfInt.h	(.../nsfInt.h)	(revision 9ae451a203a43950611411ccb52efed5263a4031)
+++ generic/nsfInt.h	(.../nsfInt.h)	(revision 5a2b98270f0610fb37a23436687cf2468f0d8936)
@@ -359,26 +359,27 @@
 
 /* flags for NsfParams */
 
-#define NSF_ARG_REQUIRED		0x0001
-#define NSF_ARG_MULTIVALUED		0x0002
-#define NSF_ARG_NOARG 		     	0x0004
-#define NSF_ARG_CURRENTLY_UNKNOWN	0x0008
-#define NSF_ARG_SUBST_DEFAULT		0x0010
-#define NSF_ARG_ALLOW_EMPTY		0x0020
-#define NSF_ARG_INITCMD		     	0x0040
-#define NSF_ARG_METHOD		     	0x0080
-#define NSF_ARG_RELATION		0x0100
-#define NSF_ARG_SWITCH		     	0x0200
-#define NSF_ARG_BASECLASS	     	0x0400
-#define NSF_ARG_METACLASS	     	0x0800
-#define NSF_ARG_HAS_DEFAULT		0x1000
-#define NSF_ARG_IS_CONVERTER		0x2000
-#define NSF_ARG_IS_ENUMERATION		0x4000
-#define NSF_ARG_CHECK_NONPOS		0x8000
-#define NSF_ARG_SET		       0x10000
-#define NSF_ARG_WARN		       0x20000
-#define NSF_ARG_UNNAMED		       0x40000
-#define NSF_ARG_IS_RETURNVALUE	       0x80000
+#define NSF_ARG_REQUIRED		0x000001
+#define NSF_ARG_MULTIVALUED		0x000002
+#define NSF_ARG_NOARG 		     	0x000004
+#define NSF_ARG_CURRENTLY_UNKNOWN	0x000008
+#define NSF_ARG_SUBST_DEFAULT		0x000010
+#define NSF_ARG_ALLOW_EMPTY		0x000020
+#define NSF_ARG_INITCMD		     	0x000040
+#define NSF_ARG_METHOD		     	0x000080
+#define NSF_ARG_FORWARD		     	0x000100
+#define NSF_ARG_RELATION		0x000200
+#define NSF_ARG_SWITCH		     	0x000400
+#define NSF_ARG_BASECLASS	     	0x000800
+#define NSF_ARG_METACLASS	     	0x001000
+#define NSF_ARG_HAS_DEFAULT		0x002000
+#define NSF_ARG_IS_CONVERTER		0x004000
+#define NSF_ARG_IS_ENUMERATION		0x008000
+#define NSF_ARG_CHECK_NONPOS		0x010000
+#define NSF_ARG_SET			0x020000
+#define NSF_ARG_WARN			0x040000
+#define NSF_ARG_UNNAMED			0x080000
+#define NSF_ARG_IS_RETURNVALUE		0x100000
 
 /* Disallowed parameter options */
 #define NSF_DISALLOWED_ARG_METHOD_PARAMETER	     (NSF_ARG_METHOD|NSF_ARG_INITCMD|NSF_ARG_RELATION)