Fixed up some more ArcGIS generalization.