and these changes to package-vc.el: