Another round of code review changes.