More clean-up of the MapProvider and MapProviderTemplate classes.