Apply PR review comments.