Minor cleanup of listener package.