Refactored city generation loop to remove repetitive code.

I was cleaning this up to figure out where to place population markers, then discovered that it basically has nothing to do with this code.
The cleanup is good though, it's understandable and less repetitive.