To put it simply, it would be nice if each individual in a diagram had
their own spouse option, rather than one option for the whole diagram. But I
realise that this would entail substantial changes to the program.
However, as you suggest, I think I can achieve what I want with some
judicious Moving and Hiding.