[Zope] [ZGotW] Fixes (thanks Evan, Jeff, Ross!)