[Bug #39158] Source cleanups suggested by cppcheck utility.
12 files changed