Clarify signatures.
Merge branch 'develop' into json-ld
Consolodate value extraction and hydration into one class.