Work better on various versions of clang.