Further polishing of the identity api.