Split the listener - those events don't need to happen at HIGHEST
priority.
Clean up more of block listener.