Clean up CookieJar, backport #1304