Merge "clang is >= 3.4 now; remove a hack."