HOTFIX: Accept either a list of possible values, or a string as a value for I'm pulling this in myself because it's urgent, it's the weekend, and I don't want this to get forgotten.
