Restructure cookies a bit to remove need for observation. Ref #322.

Signed-off-by: Ben Corlett <bencorlett@me.com>