Remove support for contextual and ordered property values (again) per issue #10.
Add simplified vocabulary expansion from discussion on issue #10. This obviates issue #11 entirely.
Remove struck text to make the spec easier to read.