Euca 7937

Improvements that reduce listeners in the system.