Apply code review fixes.