Clean up DeferredDispatcher and add comments