gcc patch #131866: improvements