Common template elements

Another small piece of improved consistency?