Fix city limits expansion when city is building bridges.  Clean up associated code.