Some modifications to timestream.py.