Rewrote infix notation parser to use a proper tokenizer.