Convert annotate from query_tty_yesno to query_yesno