Simplify functions now that there's only one buffers array