gcc patch #131883: improvements