Add optimizations for binary and unary operators