REVIEW-3488: Don't use concrete type for matching ID.