Some minor template updates to save us some extra work.