Fix regression in pkg annotate since introduction of query_yesno