Still wrestling with cppcheck.  Sigh.