Tox cleanups.