Per @mlucy, lose spaces
Clarify situation with data_buffer_t.