gdb patch #131676: improvements