Move CoreListener event firing to CoreListenerSupport.