Merge "Remove an obsolete TODO now we have a new clang." into main