More work on RDF-1.1 migration