Restore ArenaUpdater, get rid of some deprecation