Lps 32715 Refactor TemplateParser, recommit2.