Amended infix macro to support unary operators better