`cfe_canonify`?

We need to look for all instances where it's used so we don't have surprises later.  Maybe make this a separate commit.