3361 - clearer commandline parsing