Merge pull request #6288 from libgit2/cmn/mwindow-simplifications A couple of simplications around mwindow