Making some post-submission edits recommended by David.