Added improvements identified by cppcheck.