Improve computation of the buffer's org data content.