Lots of code cleanup. No longer using a lexer.