Refinements to cookie handling to simply callers.

See update.txt for notes.