A bit of template tidying.