More magit-related changes