Re #9483. Getting rid of cppcheck warnings.