Ongoing BaseLayerPicker work

Flesh out specs and minor cleanup.