am ed29345c: Merge "Clean up debugger.cpp slightly."

* commit 'ed29345c22acec61e4ef8953baefc64dc750c812':
  Clean up debugger.cpp slightly.