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

* commit '06163c293231b62198402b8a3f7a9e9f8ed69701':
  Clean up debugger.cpp slightly.