Tweaked auto-complete.