Improve matchers for neocomplete