More work on RemoveBatch undo/redo