Adjustements to magit due to recent flux.