Update zope.* import and pyflakes cleanup