aaron.ballman added a comment. My only remaining concern is with the diagnostic message/fixit interaction itself. Let's see if @alexfh has any suggestions there, or we think of an improvement ourselves. https://reviews.llvm.org/D39121