Made more optimizations, took out shunting, though lost some operands.