Getting rid of a few cppcheck warnings.

Minor changes that do not change the behaviour of the program.