Move CL checks in parse_command_line