Same patch, functionally, except implemented as a subclass of the original Dispatcher.