gberry added a comment. Hi Sanjoy, Thanks for the review. I've made the changes you suggested. I'm not entirely pleased with the duplicating of InsertPointGuard, though I also wasn't pleased with changing the InsertPointGuard interface. http://reviews.llvm.org/D20703