Switch to use of an "upgrading" flag instead of actually replacing openWindow.