Improving the debugger information a bit.