This version should be logically identical to the previous version but prevents a false-positive from the cppcheck static analysis tool.