Improve diff-mode navigation/manipulation