22.0-cppcheck-CscSegmentMakers

Tidy up cppcheck warnings (postfix -> prefix increment) and errors, which were actually false positives (invalid iterator) but took the opportunity to make the code more explicit and (hopefully) more efficient in those places.