We really should do as it would have prevented a bug. But this is going to take some effort... Be prepared that this is not the most fun task.

Also, be carefull not to introduce msrv changes with this.