Minor, superficial changes to templates.