Minor cleanup to ResolveIvyFactory

+review REVIEW-5253