Grainfmt: Experiment with removal of infix_wrap argument

[phated]

The infix_wrap argument mostly seems like a workaround and I think we could better factor out the behavior. This is just cleanup on #1976 so we can do it later.