Support changes in listener to removing globals