Clean up some constant import/export.
Fix a bug reading from an empty BufferStream.  Up test coverage of BufferStream while I'm preventing regression.