Changes due to moving magit from git checkout to package.