Issue #311 - Preincrement to postincrement and more whitespace reduction.