Update to pass updated spec tests.
Remove contextual and rdf:List stuff (again). Use simplified vocabulary expansion.
Algorithm tweaks.