lambda-to-listener conversions updated