fix Issue 9936 - Wrong opBinary/opBinaryRight rewrite.

opBinary, opBinaryRight, and opOpAssign had same problem.
Merge pull request #1899 from 9rnsr/fix9936

Issue 9936 - Wrong opBinary/opBinaryRight rewrite.