Auto merge of #150748 - nnethercote:canonicalizer-cleanups, r=lcnr

Canonicalizer cleanups

Some cleanups in and around the canonicalizers, found while I was looking closely at this code.

r? @lcnr

Author: rust-bors[bot]