Improve ido and ido-flx autoloading