More modifications according to the review.

svn path=; revision=84611