Proposed resolution:

With the exception of 18.8.2.1 [bad.exception], move clause 18.8.2 directly to Annex D. [bad.exception] should simply become the new 18.8.2.