Minor improvements.

Save a little system resource by combining a few listeners.