Update autocomplete to handle custom identifier regexprs