Cleaned up CSP.from_file.