Fixing nitpicky items from code review.