Another step in consolidating the saved-state globals.