Looks good (would've been totally fine for you to commit this without an extra review round-trip, sorry - I could've been more clear about that when I suggested the idea) http://reviews.llvm.org/D5975