Realignment

Various changes made to make the text in this repository match (fairly
closely) with the actual text of current JP documents and create a basis
for soliciting platform planks.