Updates to support new debugger.  Additionally, fixed a #ifdef guard
deficiency.