Merge "More dynamic linker cleanup."