(Started using the new convenience Template constructor where possible.)