There is no guarantee that the increment and the branch

are in the same block.  Insert the new increment in the
correct location.

Also, more cleanups.

llvm-svn: 100271