More work on session_store.