Assorted minor corrections per code review.