eklepilkina added a comment. There is a suggestion to add new option, which will change standart behaviour to word-matchinf instead of addding new set of CHECKs directives. What about this idea? https://reviews.llvm.org/D22353