Hm, I wanted to upload the changes that I needed to make, but phab apparently doesn't handle that well... So you'll have to make sure to look at what I changed before submitting. http://reviews.llvm.org/D4739