CircularStream is now a BlockingCircularStream.

Checkpoint. The circular buffer stuff is not there yet, but almost.