Address complaint from cppcheck, prefer prefix--, re #8051