Buffer.cpp/.h cleanup.