(do-auto-fill): Remove unused vars `bol' and `opoint'. (completion-setup-function): Use with-current-buffer. Properly save excursion. Simplify. Don't assume there is necessarily a `mouse-face' property somewhere.