CMS-1989 Refactor all local listeners to be written the same way