Another pass on templates. Use combine_templates