Intermediate checkin, and correcting a CORS messup.