One more round of cleanups and edits.