More linker cleanup.