[backport] Backports library changes related to SI-6566 from a419799

The idea of backporting this occured while developing the -source flag for
SI-8126 : withouth this the library breaks at refchecks for a Scala compiler
that checks type aliases variance.

This should be BC and promote good hygiene.