Fix more linker testsuite failures.