Fixed bug wherein metadata.guid is assumed in inner object, shich
doesn't apply to non-entities like instances