TS-1475 Avoid clang warnings on Dead store / increment