Updated to using the new lexer with push-lexer, pop-lexer, and swap-lexer. Improved the lexers and parser.