WIP - refactor cookie disclosure features based on discussions.