cleanup: inline field in deathlistener