Made some additional minor style changes (making pre/post auto-increments consistent where there order does not matter).