dberlin accepted this revision. dberlin added a comment. This revision is now accepted and ready to land. I think, assuming all comments are addressed, that this looks fine to commit and iterate from there. http://reviews.llvm.org/D13259