More work on listeners.