Finished changes requested in review.

Changes are untested.