Added missing dependencies and removed DispatchImpl's dependency on
itself. (Go figure).