Updated EventDispatcher.

Signed-off-by: Lanny McNie <lanny@gskinner.com>