Typically, `todo_wine` is removed in the commit that fixes the behavior of the underlying API function. (This may be the reason your change hasn't been merged yet.)
True, although at this point it's more a case of me just trying to deal with one thing at a time (i.e. get the AF_UNIX patches in before looking at this one).