Yep, LGTM. I'd personally prefer to do the other patch first to avoid testcase churn, but that's just a preference. As long as we get there, the order isn't the important bit. http://llvm-reviews.chandlerc.com/D2667