[MP] A few more cleanups reported from cppcheck.