https://gcc.gnu.org/bugzilla/show_bug.cgi?id=32003
--- Comment #6 from Martin Sebor <msebor at gcc dot gnu.org> --- That sounds good to me. Unless someone beats me to it, I can see about making those changes in stage 4 after I'm done with all my stage 3 work.