Import order fixes for generation scripts

Needed for flake8-import-order