Bug 10419: (follow-up) tidy names of command-line switches