[#1404] cppcheck errors in new MSO code