gcc patch #131793: improvements