Remove more cppcheck(1) lint.