Start shifting the appropriate callback setters back to accepting a window handle. Didn't get very far, and it's totally untested (beyond that the changes do compile)