[#1404] Should reduce cppcheck warnings.