Remove all this re2 stuff
Fix a zope py3k thing (whatever zope is...)