One last comment and it looks good to me otherwise.
Note that will also conflict with https://gitlab.winehq.org/wine/wine/-/merge_requests/2640 as I renamed transform_append_element to append_element, so you'll have to rebase on top of it, sorry about that.