Address more code review issues.