gdb patch #131986: improvements