Fix pep8 not-in warnings