Fix-ups in response to code review.