Refactor adding infix ops.