Revise the workaround for OpenBSD Clang