Tidy up parse_command (it had a senseless list comprehension)