Terser persistence.

Cookie code cleanup. Still ugly-ugly. Too much hassle.