And on diff_to_buffer too.