Small code review improvements.