Merge "More linker cleanup."