Improve logic for cohort visibility labels

TNL-25
I kept getting test failures where this happened for various reasons, so it seemed worth solidifying this logic now. I could imagine it could happen in production even without explicit cohort deletion. My preference would be to leave this in, but I could be persuaded that I'm wrong. :-)