Fixes to parser-lalr to allow it pass more tests, and to the lexer tools