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

update: no longer on top of #7959 and #7838.
that should be ok