Minor cleanup of templates.