More TerrainProvider cleanup.