Make tokenizer throw error on empty char literal, along with some slight cleanups...