kubabrecka added a comment. I'm going to split this into two patches. The first one is refactoring only (NFC), which just landed in r252052. I'll watch the bots, and if nothing breaks, I'll commit the rest soon. http://reviews.llvm.org/D14330