a few more import order fixes for upcoming flake8-import-order