Fixing `data.batch()` when Objects to set have functions as properties