Minor changes in DataProvider utility methods.