Equality: less automatic simplification and fix 'Eq(p, 0)' for p positive

update: no longer on top of #7959 and #7838.
Ok, I've tried to follow @smichr's suggestion.  I left the `Eq(positive, 0)` test because it really was failing before so I figure that counts as coverage.