gcc patch #131083: improvements