Fix two rather subtle internal vs. external linker issues.