Slight refactoring to make testing and debugging Surefire easier.