Merge: PEP8 fixup on previous patch, remove unused imports in test_email.