Yet more edits.