Smarter template builder (refs #9502)