Minor tweaks

Minor tweaks in the placement of some ++ operators, to minimize
the changes. (suggested by HostileFork, Ladislav, and other...)