Also fixes some of the wonky stuff in Main where we would fire an event to do post-init stuff which isn't necessary anymore.