More clean-up based on code review.