lambda-to-change-listener conversions fixed and tested