TemplateParser: replaced branch-value with branch-values everywhere