Minor edits and reorderings.