Re-order preprocessor args to agree with User Guide (fixes #8602)