cppcheck: update for the new error format.  Remove duplicate code.