Some cleanups in our normalization logic#109171

bors merged 2 commits intorust-lang:masterrust-lang/rust:masterfrom

oli-obk:normalization_cleanupoli-obk/rust:normalization_cleanupCopy head branch name to clipboard