Clear and suppress cppcheck warnings. re #10091