Finished updates from recent code review.