Edits suggested by @boegel and general cleanup.

Some cruft was added by EB as a result of saving back the file, and it
gets dutifully removed now. (Well, hopefully!)