Another batch of changes as we move to a single ObservableCollection.