Simpler buffer management