More code review suggestions.