Tokenizer: simplify enums better. add parentheses to enforce operator precedence.