Issue #311 - Change preincrement to postincrement. More whitespace changes.