Adjusted refactoring of vendor checks.

Thanks Shai for the thorough review.