Improve performance of completions

There have been reports of delayed completion suggestions on some systems. Need to investigate and see where we can improve.