[Zope-dev] ZCatalog and indexes cleanup