Clang: reorganized patches for clang-3.4