Minor refactoring in DataAccessor.