Small changes to parse_simple_command