Incorporate code review comments.