Updated how ValueSet/Definition references are built.