More clean-up; avoid unnecessary LISTEN / UNLISTEN queries.