Simplified templating due to new estemplate features.