Fixed match-propn-components to stop descending at propn-args.

Also flattend output: No more vectors around matched args.
Also added turn-propn-pair-families-into-id-families.

Now probably don't need any of the complicated non-working functions
I put in Step 4 previously.