Many changes across the entire document, commenting out some material
and editing other material, in order to make an internal draft version
for sharing with OSI.