[Zope-dev] ch-ch-ch-changes (post-merge fallout)