Merge "Use proper arg key for --help option"