scanner: Fixing review comments.