Further OpenBSD-ifying