Templates: Minor improvement.