Never try to update to an old client-state string.
Fix review nits.