AbstractTemplateContext Refactoring almost complete. refs #459