scanner: Update based on review comments.