Trivial template changes.