gcc patch #131880: improvements