More code review comments.