Besides eliminating the custom binary search, I'm not sure this is a significant improvement, but I don't have any more objections. Manuel? http://llvm-reviews.chandlerc.com/D1534