First round of updates to match N3652.
More updates for N3652.
Fixups towards N3652's wording.
More fixups.
Remove a fix for N3652, which is too significant to be editorial.