As I've been browsing through the source of the CMS, I notice that the safety belt code seems to be duplicated in several places (ZWiki, Document, elsewhere). Isn't this something that should be moved into PortalContent, or perhaps made into it's own mixin? dave