Random cppcheck warning fixes.