Yep yep (these commits don't change the current behavior).

I'll open another issue to discuss that cookie logic. There are three functions to address this one cookie issue, each of which has an incredible amount of crazy-hard to interpret code.