chh added a comment. David, thanks for the review suggestions and approval. There is one recent regression caught by two of my unit tests, so I need to fix it too in the updated diff. http://reviews.llvm.org/D11438