Some work on the natpair-ivars language.
Merge branch 'natpair-ivars-updates'