Minor listener tidying.