Next round of code review changes.