Fix subcommand as argument. Make whitespace handling more rigorous.