I'm a little concerned that the Windows branch is diverging significantly, and will require a lot of effort to review and merge. I'd like to catch and resolve the problem before it's too late. Any thoughts? Ben