Cleanup patch from Martin Bligh: convert some loops which want to be
`for' loops into that, and add some commentary.