Fix command-line parsing again?