In addition to the changes from #6933 this handles cases that could be matched with the included cocci file.