Better support for Plone 4.