Nicer debug factoring