Re-fix lexer and parser to work with Alex 3

GitHub creates a merge commit when a pull request is accepted through the GUI even if it could just be fast-forwarded, which I don’t like. To avoid that, pull and push manually. I think GitHub detects that and automatically closes the pull request.