Minor refactoring.

refs #1929