Diff of orphaned tooltip_buffer code