refs #9906. More refactoring. More reuse. 0.8 second processing.