Reflect update of clang-3.1.