More robustly add auto-complete to completion-at-point-functions