Fix autocomplete for 'i', '<' and '>'