Restructure infixish to be more in line with STD.

This just aids parsing; the now-enabled extra cases will need some AST
generation improvements too.