Improve tokenless autocompletion; fixes #38