Revise buffer/seek code a little.
Tidy up user streams even more.
Make test case quite aggressive.

Tidy up some user stream code.
Add a small test case (not yet complete).