Minor refactoring on FillTemplateWrapper. refs #418