(Tried to) fix screwed-up repo: Sth from branch EntityListener in master.