Simplify BufferReader.  Add test.