Here are my proposals to resolve a few issues with the current
 draft.
See the corresponding message to the list for details.