Much better autocompleter.

Fixes.