Fixing "by reference" regressions within `data.batch()` & `data.set()`