More cppcheck warnings

7 jobs for restructure_ObjectTypes in 60 minutes and 36 seconds (queued for 6 seconds)