The planned changes, along with the explanations for why things are that I asked about, address all my concerns.

See this thread for my earlier review and David Schinazi's response: https://mailarchive.ietf.org/arch/msg/secdir/glXoIe7V2VTEqtKx7VbIP86EWtc/