Updates for newer pep8 library
Remove unneeded TupleProperty effects more aggressively