The first. Yeah, please, fix it everywhere in a separate commit. Ideally we'll check for this automatically at some point.