Refactoring. Refs #CORE-851.