Polish off a few last pep257 warnings [1780]