There's a lot of these lines of code in this PR. Could we perhaps beef up normalizeParameters to know about the positional parts of the command line as well and remove the manual parameter twiddling?