refs #8376. More refactoring.