cleaning up issue found by pydev.  also adding in new zope-interface annotation style