Give up less easily when trying to break a line
Remove PyPy form default list

It hasn't been working with tox for quite a while.