Make OneOrMoreSpacePropVars have at least 3 subnodes.  Refactor.