Reviewer’s comments, removing the last uses of `askOption`.