Family instance consistency

Edward Could you possibly take a look at #14396? It's going to bite us soon, as Alan's Trees That Grow patch lands (see the branch mentioned on the ticket). (In fact, Alan, I don't know how you build that branch ; I can't build it.) Simon