Move death message handler to a separate listener.