Batcher: properly clear the batch when an object is removed; see #19