Tweak MAIN handling to not need auto-close.