Small tweaks to make flake8 happy