Better explicit fix for Clang and GCC builds.