EUCA-7768 - was passing results of a function, rather than the function itself to the listener. Fixed here.

Ean spotted a problem with the way I had done these update listeners. Fixed.