gcc patch #131792: improvements