[sr-dev] git:master:2f29115d: auth_identity: code clarity adjustments