More code review adjusts.