Fix new flake8 warnings introduced with version 7.0.0 (currently in the dev3/4 nightlies). Mostly related to type comparisons.
cc @elmsheus