The proposed GID In Children diagnostic criteria are highly gender-normative and gender-binary; GID In Adolescents And Adults less so, but still not what I'd like.
It wasn't as bad as I'd feared it might be with Kenneth Zucker on board. It looks like the Transvestic Fetishism diagnosis is still hanging on, though, which is disappointing.