Simplify some loops

Just a quick cleanup of some old-style loops that I noticed while reviewing some of Howard's warning-quashing changes.