Fix recently added PEP8 violations

These violations were introduced recently, _after_ we had removed all
instances of these violations. As of now, these represent the final PEP8
violations.

This PR also drops the PEP8 threshold down to zero violations (!!!), so
it will need to be merged _after_ #6045 lands.