Fixed some of the tokenization rules.