Finished value expansion except for a few questions about @type and potentially some of the handling for RDF types (if that'll apply).