Extract and share the common code for the 2 cookie controls.
Merge pull request #235 from bstell/master

Extract and share the common code for the 2 cookie controls.