Adding more to template instantiation.