Add a helper function so we always check these as potentially multi-valued instead of incorrectly and inconsistently looking for substrings or strict equality.
Add a helper function so we always check these as potentially multi-valued instead of incorrectly and inconsistently looking for substrings or strict equality.