Index: /trunk/src/VBox/Main/include/GuestSessionImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/GuestSessionImpl.h	(revision 75862)
+++ /trunk/src/VBox/Main/include/GuestSessionImpl.h	(revision 75863)
@@ -257,7 +257,4 @@
      *  The key specifies the (global) context ID. */
     typedef std::map <uint32_t, SessionObject> SessionObjects;
-    /** Queue containing context IDs which are no longer in use.
-     *  Useful for quickly retrieving a new, unused context ID. */
-    typedef std::deque <uint32_t>              SessionObjectsFree;
 
 public:
Index: /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp	(revision 75862)
+++ /trunk/src/VBox/Main/src-client/GuestCtrlImpl.cpp	(revision 75863)
@@ -169,4 +169,5 @@
          */
         bool fDispatch = true;
+        rc = VERR_INVALID_FUNCTION;
         if (   pCtxCb->uFunction == GUEST_EXEC_STATUS
             && pSvcCb->mParms    >= 5)
@@ -185,5 +186,4 @@
                 Assert(dataCb.uPID == 0);
                 fDispatch = false;
-                rc = VINF_SUCCESS;
             }
         }
@@ -220,6 +220,4 @@
             }
         }
-        else
-            rc = VERR_INVALID_FUNCTION;
     }
     else
Index: /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp
===================================================================
--- /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp	(revision 75862)
+++ /trunk/src/VBox/Main/src-client/GuestCtrlPrivate.cpp	(revision 75863)
@@ -1262,14 +1262,14 @@
  *                                  for this event. Optional.
  */
-int GuestBase::waitForEvent(GuestWaitEvent *pEvent, uint32_t msTimeout, VBoxEventType_T *pType, IEvent **ppEvent)
-{
-    AssertPtrReturn(pEvent, VERR_INVALID_POINTER);
+int GuestBase::waitForEvent(GuestWaitEvent *pWaitEvt, uint32_t msTimeout, VBoxEventType_T *pType, IEvent **ppEvent)
+{
+    AssertPtrReturn(pWaitEvt, VERR_INVALID_POINTER);
     /* pType is optional. */
     /* ppEvent is optional. */
 
-    int vrc = pEvent->Wait(msTimeout);
+    int vrc = pWaitEvt->Wait(msTimeout);
     if (RT_SUCCESS(vrc))
     {
-        const ComPtr<IEvent> pThisEvent = pEvent->Event();
+        const ComPtr<IEvent> pThisEvent = pWaitEvt->Event();
         if (pThisEvent.isNotNull()) /* Having a VBoxEventType_ event is optional. */ /** @todo r=bird: misplaced comment? */
         {