Fix generation of infix ops