Small update in threadprivate variables processing to fix template instantiation.