more breakpoint friendly refactoring
Merge pull request #2052 from stefanpenner/master

more breakpoint friendly refactoring