Apply changes to the compiler pass to deal with aliases
Merge remote-tracking branch 'origin/listener-fixes'