Fix an issue related to template instantiation.