match-args now calls match-propn-components-too rather than match-propn-components.  still not right.