DeleteWindow() is calling FreeWindowResources() which is calling
DisposeWindowOptional() which sets pWin->optional to NULL. So the now
removed code was never called. After removal DeleteWindow() is
identical to the dix version, so we use that one.