gcc patch #131843: improvements