refs #8376. Some minor refactoring steps.