Merge "More OpenBSD cleanup (primarily string)."