GPII-177: Fixed minor issue with the binary op expander, ensuring that it only evaluates if both operands are specified or a default value has been given