Looks good but I would reorder things to make sure the class is moved in a single commit and doesn't get registered before that in multiple places at once. Something like https://gitlab.winehq.org/rbernon/wine/-/commits/tmp-7308 if you don't mind updating this MR with it.