Improve logic for cohort visibility labels

TNL-25
I was unsure about that. It existed in both the places that I refactored into this method, so I was nervous that it would cause problems if it wasn't done everywhere. Are you more comfortable with it being here once I rename the method to be more generic?

Can you give me some context as to what the patch is for. Which clients are relying on it being explicitly set?