Address more code review results.