What about colleagues? We've heard from people who say that it's not really about making disclosures to a particular person; you should eliminate the criteria altogether.
Your suggestion regarding expanding the definition of supervisor is against international best practice.