Minor refactorings in DataViewModelOptions.