Popup: Do not unenhance upon _destroy() if the "enhanced" option is on, but do still close the popup. Fixes #6160.