Cleanup from code review.