[WIP] Use lexer 

This suggestion may also be unneeded: it's a parser, after all.