work towards #8107.  Some tweaks to the template.