More work on typeahead.