CSP3: Restructure definitions.
CSP3: s/URI/URL/g
CSP3: Cleaning up 'delivery' section.
MIX: Convert checks to environment settings objects.