Windows dtor support
Another TODO item down!