Work with newer magit.