Make Clang post 3.4 ready