Yes, same code. Just to be clear, I'm not too hapy about this duplication either but the creation of the concrete buffers is too tangled to be factored out without too much effort. Ideally this is something I'd like to reduce once we have better ways of iterating over pages.