Mostly changes to make GDB work better.