So instead of getting rid of the whole thing, can we just nibble away at
pieces that are duplicated elsewhere and move pieces, that aren't, into an
appropriate place?