adapt to changes in Magit proper