Lots of small changes from code review.