[Zope] Patch to avoid hypenation variables and more