Hook up services, and remove most uses of GeoDataCollection.