Fixing issues reported by cppcheck (1).