Rollup merge of #136504 - lqd:more-compare-modes, r=jieyouxu

Fix last compare-mode false negatives in tests

This PR is a continuation of #136310 and fixes the last remaining cases of false negatives when running tests under a compare-mode.

With these normalizations, all the compare-mode failures in `next-solver` (and `polonius`) should now be real, actual differences in diagnostics.