Whoops, forgot one of those changes.
Random changes in MainContextListener.