Smaller changes after Darrell's review.