Revert "Concerning 791: binary operation with 0-by-0 is a no-op" + fix

This reverts commit 4debbf4061d87151b91274c7884e949e959ccfd8.