Working on ANTLR optimization - rewrote operators..