It turns out I didn't get it quite right in the case of compacting
collection.  This should make it work again.