"Any restrictions arising from eligibility criteria should be based on data collected from a demographic group that is consistent in gender and athletic engagement with the group that the eligibility critieria aim to regulate". and "for the specific sport, discipline and event"
So this is the Semenya approach, as far as I can tell.
Each sport has to individually show that "male athletes who call themselves women" have an advantage at that level of competition in that specific sport.
No cheating and looking at male athletes who don't call themselves women, or in different sports, or at other levels. You have to specifically wait for men calling themselves women in your sport and figure out if they have an advantage or not.