REVIEW-4086/REVIEW-4087: Use the more general type ComponentIdentifier.