final flake 8 fixes

at least I don't get errors from "make test" locally.