Improved formatting of binary expressions

Improved formatting of binary expressions with function calls in the second operand.