Changed one-state tokens to their string representations for clarity.
Fixed lexer precedence issues by rearranging items.