Integrated reviewers comments (and now debugger's tests should compile fine)