Rejects keywords for infix operations
Refines if and return expressions

* prefer If over IfElse
* add layout constraint to return