No real change, but makes it marginally easier to merge the remainder of the out-of-tree patches. llvm-svn: 317796