[Zope-dev] Cleaning up some bitrot