Better workaround for Clang bug on Windows