Refined jensverwiebe patch for clang compilers.