Little rework in Layer and MapView.