Adjust OpenBSD-specific code to match OpenBSD-current