Hopefully final pre PR clean to BaseLayerPicker terrain support.