Merge "Clean up debugger.cpp slightly."