only persist token values that are non-nil