7.0 fix flakes8

I usually got with `FIXME` instead of `XXX` as a lot of editors will highlight that string along with `TODO`