Move some sync-related options to being session variables.