Improved ability to avoid confusions between libraries