hintonda added a comment. Yes, those were mostly in comments. I'd just done a simple find/grep that didn't take context into account. I agree that multiple checkins would be best which will make it much easy to review. http://reviews.llvm.org/D18217