More work for TemplateDefs pointing to the same template. refs #500