Issue #26: Cleanup in *DeviceLocationDataSource classes.