Minor edits.

These changes were living as uncommitted code for a couple of days, at
least.