Simplify pending segments

[bcarruthers]

Pending additions and removals have been stored separately, so to allow for multiple add/remove to the same entity before commit, an extra layer of indirection and complexity was introduced via PendingBatches. But this could probably all be collapsed down to a single set of combined add/remove segments.

[bcarruthers]

Combined addition/removal segments: 833518a