Refactored the event propagation mechanism.