Fix console command line tokenization