Make the command-line parsing consistent and clear.