diff --git a/webrtc.html b/webrtc.html
index 7d34b1556..f2ce745b6 100644
--- a/webrtc.html
+++ b/webrtc.html
@@ -66,13 +66,7 @@ <h2>Introduction</h2>
   <section id="conformance">
     <p>This specification defines conformance criteria that apply to a single
     product: the <dfn>user agent</dfn> that implements the interfaces that it
-    contains with the exception of the <code><a>RTCIdentityProvider</a></code>
-    interface which is used by the
-    user agent but not implemented by the user agent.</p>
-
-    <p>It also defines conformance criteria for identity providers which provide
-    implementations of the <code><a>RTCIdentityProvider</a></code>
-    interface.</p>
+    contains.</p>
 
     <p>Conformance requirements phrased as algorithms or specific steps may be
     implemented in any manner, so long as the end result is equivalent. (In
@@ -6067,7 +6061,7 @@ <h4 id="sec.create-identity-proxy">Instantiating an IdP Proxy</h4>
       <h2 id="sec.register-idp">Registering an IdP Proxy</h2>
 
       <p>An IdP proxy implements the <code><a>RTCIdentityProvider</a></code>
-      callback interface, which is the means by which the user agent is able to
+      methods, which are the means by which the user agent is able to
       request that an identity assertion be generated or validated.</p>
 
       <p>Once instantiated, the IdP script is executed.  The IdP MUST call the
@@ -6081,8 +6075,9 @@ <h2 id="sec.register-idp">Registering an IdP Proxy</h2>
         <dt>void register(RTCIdentityProvider idp)</dt>
         <dd>
           <p>This method is invoked by the IdP when its script is first
-          executed.  This registers an instance of
-          <code><a>RTCIdentityProvider</a></code> with the user agent.</p>
+          executed.  This registers
+          <code><a>RTCIdentityProvider</a></code> methods with the user
+          agent.</p>
         </dd>
       </dl>
 
@@ -6234,7 +6229,7 @@ <h3 id="sec.identity-proxy-assertion-request">Requesting Identity
         <li>
           <p>The <code>RTCPeerConnection</code> invokes the <code><a
           href="#widl-RTCIdentityProvider-generateAssertion-Promise-RTCIdentityAssertionResult--DOMString-contents-DOMString-origin-DOMString-usernameHint">generateAssertion</a></code>
-          method on the <code><a>RTCIdentityProvider</a></code> instance
+          method on the <code><a>RTCIdentityProvider</a></code> methods
           registered by the IdP.</p>
 
           <p>The <code>RTCPeerConnection</code> generates the
@@ -6369,8 +6364,7 @@ <h3 id="sec.identity-verify-assertion">Verifying Identity Assertions</h3>
         <li>
           <p>The <code>RTCPeerConnection</code> invokes the <code><a
           href="#widl-RTCIdentityProvider-validateAssertion-Promise-RTCIdentityValidationResult--DOMString-assertion-DOMString-origin">validateAssertion</a></code>
-          method on the <code><a>RTCIdentityProvider</a></code> instance
-          registered by the IdP.</p>
+          method registered by the IdP.</p>
 
           <p>The <var>assertion</var> parameter is taken from the decoded
           identity assertion.  The <var>origin</var> parameter contains the