Index: trunk/psphot/src/psphotArguments.c
===================================================================
--- trunk/psphot/src/psphotArguments.c	(revision 29004)
+++ trunk/psphot/src/psphotArguments.c	(revision 31154)
@@ -109,12 +109,13 @@
     }
 
-    PSARGUMENTS_INSTANTIATE_GENERICS( psphot, config, argc, argv );
+    // generic arguments (version, dumpconfig)
+    PS_ARGUMENTS_GENERIC( psphot, config, argc, argv );
+
+    // thread arguments
+    PS_ARGUMENTS_THREADS( psphot, config, argc, argv )
 
     // save the following additional recipe values based on command-line options
     // these options override the PSPHOT recipe values loaded from recipe files
     psMetadata *options = pmConfigRecipeOptions (config, PSPHOT_RECIPE);
-
-    // Number of threads is handled
-    PSARGUMENTS_INSTANTIATE_THREADSARG( psphot, config, argc, argv )
 
     // run the test model (requires X,Y coordinate)