At this revision, make cppcheck runs clean.