Fixing up argument parsing for the command service.