Make most of the editorial changes suggested by Stephen (there's still one left to do).