Nicer debug factoring
Merge pull request #836 from github/debug

Nicer debug factoring