Small refactoring of dependency library bridges.