Allow 1 non-expression infix match in expression position

Created by: natefaubion

At least partially fixes #327 (closed)

It's still limited to 1 term infix match, but that solves a lot of use cases.