CSP: Cleanup. No normative changes.