Try again to fix the map expansion bug -- more cleanly.
Prevent addition of more cities than requested when expanding map.
Clean up logic in generate_cities slightly.