Fix regression in command line tokenization