Move reader into Buffer and make it BufferedReader. This doesn't
introduce any new functionality just grouping similar things.