Reduce number of template instantiations
Restore default warnings