Readability tweaks for event/propagate