Minor edits after another pass.