Fix up review comments.