Further simplification of templates.