More work on the unified accumulator and buffer.