Fix lint issues.

The buildout ones still exist.