Revert "Don't treat infix ops differently with respect to tokens."

This reverts commit 1582717e83410a83d7e3bdd4218a3ae3427836b8.

The difference is important for implicitly multiplying