Improve tokenizer to ignore single {