Fix infix formatter bugs