Cleaning up event routing just a little bit.