--- a/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.cpp
+++ b/browser/metro/shell/commandexecutehandler/CommandExecuteHandler.cpp
@@ -98,16 +98,17 @@ public:
     mRequestType(DEFAULT_LAUNCH),
     mRequestMet(false),
     mDelayedLaunchType(NONE),
     mVerb(L"open")
   {
   }
 
   bool RequestMet() { return mRequestMet; }
+  void SetRequestMet();
   long RefCount() { return mRef; }
   void HeartBeat();
 
   // IUnknown
   IFACEMETHODIMP QueryInterface(REFIID aRefID, void **aInt)
   {
     static const QITAB qit[] = {
       QITABENT(CExecuteCommandVerb, IExecuteCommand),
@@ -381,18 +382,16 @@ public:
     CStringW browserPath;
     GetDefaultBrowserPath(browserPath);
 
     return !selfPath.CompareNoCase(browserPath);
   }
 private:
   ~CExecuteCommandVerb()
   {
-    SafeRelease(&mShellItemArray);
-    SafeRelease(&mUnkSite);
   }
 
   void LaunchDesktopBrowser();
   bool LaunchMetroBrowser();
   bool SetTargetPath(IShellItem* aItem);
   bool TestForUpdateLock();
 
   /*
@@ -660,22 +659,22 @@ CExecuteCommandVerb::LaunchDesktopBrowse
 
 void
 CExecuteCommandVerb::HeartBeat()
 {
   if (mRequestType == METRO_UPDATE && mDelayedLaunchType == DESKTOP &&
       !IsMetroProcessRunning()) {
     mDelayedLaunchType = NONE;
     LaunchDesktopBrowser();
-    mRequestMet = true;
+    SetRequestMet();
   }
   if (mDelayedLaunchType == METRO && !TestForUpdateLock()) {
     mDelayedLaunchType = NONE;
     LaunchMetroBrowser();
-    mRequestMet = true;
+    SetRequestMet();
   }
 }
 
 static bool
 PrepareActivationManager(CComPtr<IApplicationActivationManager> &activateMgr)
 {
   HRESULT hr = activateMgr.CoCreateInstance(CLSID_ApplicationActivationManager,
                                             nullptr, CLSCTX_LOCAL_SERVER);
@@ -743,33 +742,31 @@ CExecuteCommandVerb::LaunchMetroBrowser(
   // protocols
   } else {
     hr = activateMgr->ActivateForProtocol(appModelID, mShellItemArray, &processID);
     Log(L"ActivateForProtocol result %X", hr);
   }
   return true;
 }
 
-class AutoSetRequestMet
+void CExecuteCommandVerb::SetRequestMet()
 {
-public:
-  explicit AutoSetRequestMet(bool* aFlag) :
-    mFlag(aFlag) {}
-  ~AutoSetRequestMet() { if (mFlag) *mFlag = true; }
-private:
-  bool* mFlag;
-};
+  SafeRelease(&mShellItemArray);
+  SafeRelease(&mUnkSite);
+  mRequestMet = true;
+  Log(L"Request met, exiting.");
+}
 
 IFACEMETHODIMP CExecuteCommandVerb::Execute()
 {
   Log(L"Execute()");
 
   if (!mTarget.GetLength()) {
     // We shut down when this flips to true
-    mRequestMet = true;
+    SetRequestMet();
     return E_FAIL;
   }
 
   // Deal with metro restart for an update - launch desktop with a command
   // that tells it to run updater then launch the metro browser.
   if (mRequestType == METRO_UPDATE) {
     // We'll complete this in the heart beat callback from the main msg loop.
     // We do this because the last browser instance makes this call to Execute
@@ -779,29 +776,29 @@ IFACEMETHODIMP CExecuteCommandVerb::Exec
     mDelayedLaunchType = DESKTOP;
     return S_OK;
   }
 
   // Launch on the desktop
   if (mRequestType == DESKTOP_RESTART ||
       (mRequestType == DEFAULT_LAUNCH && DefaultLaunchIsDesktop())) {
     LaunchDesktopBrowser();
-    mRequestMet = true;
+    SetRequestMet();
     return S_OK;
   }
 
   // If we have an update in the works, don't try to activate yet,
   // delay until the lock is removed.
   if (TestForUpdateLock()) {
     mDelayedLaunchType = METRO;
     return S_OK;
   }
 
   LaunchMetroBrowser();
-  mRequestMet = true;
+  SetRequestMet();
   return S_OK;
 }
 
 class ClassFactory : public IClassFactory 
 {
 public:
   ClassFactory(IUnknown *punkObject);
   ~ClassFactory();