Per private correspondence with RĂ©mi, this will probably be submitted a different way upstream. Since it's only API cleanup, there's no reason to keep it around in wine-staging.