Re-add do-infix macro

Done right this time (maybe).