gcc patch #131875: improvements