'Gender non-conforming' would have been a better term; it slipped my vocabulary and gender-fluidity can be used in its place in most cases.