Simplify and generalize simplify-binary-op