Preparations for buffer_t rework.