Complete overhaul of our murky and damned listener class.