Cleanup parse_cmd_line()