Handle vanilla commands with spaces correctly.