gcc patch #131876: improvements