Minor changes in response to code review.