Fix separate lexer/parser grammars

Fixes #138, Fixes #141