Split out listener and Psyjnir-specific stuff