Some refactorings related to 014bf59497a71612bc4c6ecfa35f6ff463f8bb06, refs #530