[Debugger] more minor code cleanup
[Debugger] Another attempt at fixing bug #10581