Small refactor for DVSDemoUserDataSource.