Fix cppcheck warnings:

- (style) Same expression on both sides of '||'
- (performance) Prefer prefix ++/-- operators for non-primitive types