Separate incrementality logic into different interfaces for * DescriptorStorage * * fun removeFromHandled * * fun restoreDescriptors and more