Just one thing before the merge. I think it might make sense to compact the buffer at this point, too.