AbstractTemplateContext refactoring almost done. refs #459