Merge "Sync with upstream OpenBSD: trivial stuff."