Merge "Fix LP64 builds after OpenBSD string changes."