Improve neocomplete behaviour