Finish first pass at adding parse actions, and start rectifying parser
with lexer.