Update fromRDF to comply with recent changes to the spec.