Better auto-completion working.