Switch back to Clang and fix a compilation error that occurs in GCC 3.8 + Clang