Latest round of template changes.