Oops, fix command-line parsing