Simplify command-line parsing

2 jobs for 3-simplify-the-command-line-parsing in 1 minute and 7 seconds (queued for 1 second)