See https://github.com/splitwise/TokenAutoComplete/pull/243 for initial improvements. This should also address https://github.com/splitwise/TokenAutoComplete/issues/401