Make core buffers implementation prettier.