The latest version (-18) of the draft addresses my comments.