Hindsight: flake8 was right, this helps