Rename match-propn-components-too to match-propn-components, and match-propn-components to match-components-of-propn-pair.
Fix declarations for most recent changes.