At least offer a solution with msftidy

I would go ahead and fix it for the user, but due to #8497, I can't
yet.