gcc patch #131981: improvements