diff --git a/src/buffer.cc b/src/buffer.cc
index 49ef596a..a06d9783 100644
--- a/src/buffer.cc
+++ b/src/buffer.cc
@@ -518,7 +518,7 @@ void Buffer::do_insert(const BufferCoord& pos, const String& content)
     }
 
     for (auto listener : m_change_listeners)
-        listener->on_insert(begin, end);
+        listener->on_insert(*this, begin, end);
 }
 
 void Buffer::do_erase(const BufferCoord& begin, const BufferCoord& end)
@@ -543,7 +543,7 @@ void Buffer::do_erase(const BufferCoord& begin, const BufferCoord& end)
         m_lines[i].start -= length;
 
     for (auto listener : m_change_listeners)
-        listener->on_erase(begin, end);
+        listener->on_erase(*this, begin, end);
 }
 
 void Buffer::apply_modification(const Modification& modification)
diff --git a/src/buffer.hh b/src/buffer.hh
index 0f8a9602..08a29aee 100644
--- a/src/buffer.hh
+++ b/src/buffer.hh
@@ -79,8 +79,8 @@ private:
 class BufferChangeListener
 {
 public:
-    virtual void on_insert(const BufferCoord& begin, const BufferCoord& end) = 0;
-    virtual void on_erase(const BufferCoord& begin, const BufferCoord& end) = 0;
+    virtual void on_insert(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end) = 0;
+    virtual void on_erase(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end) = 0;
 };
 
 // A Buffer is a in-memory representation of a file
diff --git a/src/dynamic_selection_list.cc b/src/dynamic_selection_list.cc
index 7ad4d864..d3d3497c 100644
--- a/src/dynamic_selection_list.cc
+++ b/src/dynamic_selection_list.cc
@@ -34,14 +34,14 @@ void DynamicSelectionList::check_invariant() const
 #endif
 }
 
-void DynamicSelectionList::on_insert(const BufferCoord& begin, const BufferCoord& end)
+void DynamicSelectionList::on_insert(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end)
 {
-    update_insert(begin, end);
+    update_insert(buffer, begin, end);
 }
 
-void DynamicSelectionList::on_erase(const BufferCoord& begin, const BufferCoord& end)
+void DynamicSelectionList::on_erase(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end)
 {
-    update_erase(begin, end);
+    update_erase(buffer, begin, end);
 }
 
 }
diff --git a/src/dynamic_selection_list.hh b/src/dynamic_selection_list.hh
index c1de00f0..7f8da0f0 100644
--- a/src/dynamic_selection_list.hh
+++ b/src/dynamic_selection_list.hh
@@ -19,8 +19,8 @@ public:
     void check_invariant() const;
 
 private:
-    void on_insert(const BufferCoord& begin, const BufferCoord& end) override;
-    void on_erase(const BufferCoord& begin, const BufferCoord& end) override;
+    void on_insert(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end) override;
+    void on_erase(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end) override;
 };
 
 }
diff --git a/src/editor.cc b/src/editor.cc
index 5ccb7889..b1e227f0 100644
--- a/src/editor.cc
+++ b/src/editor.cc
@@ -364,26 +364,26 @@ public:
     ModifiedRangesListener(Buffer& buffer)
         : BufferChangeListener_AutoRegister(buffer) {}
 
-    void on_insert(const BufferCoord& begin, const BufferCoord& end)
+    void on_insert(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end)
     {
-        m_ranges.update_insert(begin, end);
+        m_ranges.update_insert(buffer, begin, end);
         auto it = std::upper_bound(m_ranges.begin(), m_ranges.end(), begin,
                                    [](const BufferCoord& c, const Selection& sel)
-                                   { return c < sel.min().coord(); });
+                                   { return c < sel.min(); });
         m_ranges.emplace(it, registry().iterator_at(begin),
                          utf8::previous(registry().iterator_at(end)));
     }
 
-    void on_erase(const BufferCoord& begin, const BufferCoord& end)
+    void on_erase(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end)
     {
-        m_ranges.update_erase(begin, end);
+        m_ranges.update_erase(buffer, begin, end);
         BufferIterator pos{registry(), begin};
-        if (pos >= buffer().end())
-            pos = utf8::previous(buffer().end());
+        if (pos >= buffer.end())
+            pos = utf8::previous(buffer.end());
 
         auto it = std::upper_bound(m_ranges.begin(), m_ranges.end(), begin,
                                    [](const BufferCoord& c, const Selection& sel)
-                                   { return c < sel.min().coord(); });
+                                   { return c < sel.min(); });
         m_ranges.emplace(it, pos, pos);
     }
     SelectionList& ranges() { return m_ranges; }
diff --git a/src/highlighters.cc b/src/highlighters.cc
index 699e408b..edd3d7d3 100644
--- a/src/highlighters.cc
+++ b/src/highlighters.cc
@@ -384,7 +384,7 @@ private:
             m_option->get<std::vector<LineAndFlag>>();
         }
 
-        void on_insert(const BufferCoord& begin, const BufferCoord& end) override
+        void on_insert(const Buffer&, const BufferCoord& begin, const BufferCoord& end) override
         {
             LineCount new_lines = end.line - begin.line;
             if (new_lines == 0)
@@ -399,7 +399,7 @@ private:
             m_option->set(lines);
         }
 
-        void on_erase(const BufferCoord& begin, const BufferCoord& end)  override
+        void on_erase(const Buffer&, const BufferCoord& begin, const BufferCoord& end)  override
         {
             LineCount removed_lines = end.line - begin.line;
             if (removed_lines == 0)
diff --git a/src/selection.cc b/src/selection.cc
index 3d8065c3..0a4c4e32 100644
--- a/src/selection.cc
+++ b/src/selection.cc
@@ -18,30 +18,31 @@ namespace
 {
 
 template<template <bool, bool> class UpdateFunc>
-void on_buffer_change(SelectionList& sels, const BufferCoord& begin, const BufferCoord& end, LineCount end_line)
+void on_buffer_change(const Buffer& buffer, SelectionList& sels,
+                      const BufferCoord& begin, const BufferCoord& end, LineCount end_line)
 {
     auto update_beg = std::lower_bound(sels.begin(), sels.end(), begin,
-                                       [](const Selection& s, const BufferCoord& c) { return std::max(s.first(), s.last()).coord() < c; });
+                                       [](const Selection& s, const BufferCoord& c) { return std::max(s.first().coord(), s.last().coord()) < c; });
     auto update_only_line_beg = std::upper_bound(sels.begin(), sels.end(), end_line,
-                                                 [](LineCount l, const Selection& s) { return l < std::min(s.first(), s.last()).line(); });
+                                                 [](LineCount l, const Selection& s) { return l < std::min(s.first().coord(), s.last().coord()).line; });
 
     if (update_beg != update_only_line_beg)
     {
         // for the first one, we are not sure if min < begin
-        UpdateFunc<false, false>{}(update_beg->first(), begin, end);
-        UpdateFunc<false, false>{}(update_beg->last(), begin, end);
+        UpdateFunc<false, false>{}(buffer, update_beg->first(), begin, end);
+        UpdateFunc<false, false>{}(buffer, update_beg->last(), begin, end);
     }
     for (auto it = update_beg+1; it < update_only_line_beg; ++it)
     {
-        UpdateFunc<false, true>{}(it->first(), begin, end);
-        UpdateFunc<false, true>{}(it->last(), begin, end);
+        UpdateFunc<false, true>{}(buffer, it->first(), begin, end);
+        UpdateFunc<false, true>{}(buffer, it->last(), begin, end);
     }
     if (end.line > begin.line)
     {
         for (auto it = update_only_line_beg; it != sels.end(); ++it)
         {
-            UpdateFunc<true, true>{}(it->first(), begin, end);
-            UpdateFunc<true, true>{}(it->last(), begin, end);
+            UpdateFunc<true, true>{}(buffer, it->first(), begin, end);
+            UpdateFunc<true, true>{}(buffer, it->last(), begin, end);
         }
     }
 }
@@ -49,10 +50,10 @@ void on_buffer_change(SelectionList& sels, const BufferCoord& begin, const Buffe
 template<bool assume_different_line, bool assume_greater_than_begin>
 struct UpdateInsert
 {
-    void operator()(BufferIterator& it,
+    void operator()(const Buffer& buffer, BufferIterator& it,
                     const BufferCoord& begin, const BufferCoord& end) const
     {
-        BufferCoord coord = it.coord();
+        auto coord = it.coord();
         if (assume_different_line)
             kak_assert(begin.line < coord.line);
         if (not assume_greater_than_begin and coord < begin)
@@ -68,16 +69,16 @@ struct UpdateInsert
 template<bool assume_different_line, bool assume_greater_than_begin>
 struct UpdateErase
 {
-    void operator()(BufferIterator& it,
+    void operator()(const Buffer& buffer, BufferIterator& it,
                     const BufferCoord& begin, const BufferCoord& end) const
     {
-        BufferCoord coord = it.coord();
+        auto coord = it.coord();
         if (not assume_greater_than_begin and coord < begin)
             return;
         if (assume_different_line)
             kak_assert(end.line < coord.line);
         if (not assume_different_line and coord <= end)
-            coord = it.buffer().clamp(begin);
+            coord = buffer.clamp(begin);
         else
         {
             if (not assume_different_line and end.line == coord.line)
@@ -94,14 +95,14 @@ struct UpdateErase
 
 }
 
-void SelectionList::update_insert(const BufferCoord& begin, const BufferCoord& end)
+void SelectionList::update_insert(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end)
 {
-    on_buffer_change<UpdateInsert>(*this, begin, end, begin.line);
+    on_buffer_change<UpdateInsert>(buffer, *this, begin, end, begin.line);
 }
 
-void SelectionList::update_erase(const BufferCoord& begin, const BufferCoord& end)
+void SelectionList::update_erase(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end)
 {
-    on_buffer_change<UpdateErase>(*this, begin, end, end.line);
+    on_buffer_change<UpdateErase>(buffer, *this, begin, end, end.line);
 }
 
 void SelectionList::check_invariant() const
diff --git a/src/selection.hh b/src/selection.hh
index 7a64f134..e8754df5 100644
--- a/src/selection.hh
+++ b/src/selection.hh
@@ -63,8 +63,8 @@ struct SelectionList : std::vector<Selection>
 {
     using std::vector<Selection>::vector;
 
-    void update_insert(const BufferCoord& begin, const BufferCoord& end);
-    void update_erase(const BufferCoord& begin, const BufferCoord& end);
+    void update_insert(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end);
+    void update_erase(const Buffer& buffer, const BufferCoord& begin, const BufferCoord& end);
 
     void check_invariant() const;
 };