gcc patch #131685: improvements