@alexr I put all of the changes in one patch because splitting them into smaller patches risks inconsistency in the tree. Do you have a suggestion on how you would like this patch to look? http://llvm-reviews.chandlerc.com/D2021