Clean up streams.py.