More work on server persistence.