tra accepted this revision. tra added a comment. This revision is now accepted and ready to land. I am OK with the change, but please wait a bit in case @rnk or @hfinkel have further comments. https://reviews.llvm.org/D40573