Merge "Clean up our OpenBSD usage."