Reworking IdP handling section.
Removing displayname, flattening 'identity'.