Handling -h/--help on the command line for more edge cases