Code review comment fixes.