Isn't this something that could be done automatically by rustfix?