... to avoid unnecessary instantiations in the library.

Tested x86_64-linux, committed to mainline.

Paolo.