Only minor changes to comments, I think.