(marginally) better autocomplete support