https://gcc.gnu.org/bugzilla/show_bug.cgi?id=81607 --- Comment #5 from Marek Polacek <mpolacek at gcc dot gnu.org> --- cp_genericize_r does this fix-up too, and so has to cp_fold, but apparently what's in cp_fold isn't enough.