Oops.  I changed that to appease pylint and forgot to run tests afterwards.  Unfortunately, some of the modules affected don't have unittests, so touching them screws up my test coverage.  Really just tripping over a landmine caused by evolving coding standards here, I guess.  I guess I need to learn the massemail code so I can write some tests for it.