We only need the block in here.
Move more event handling back into the main listener to avoid passing
the event itself.