Company mode cleanup.
Melpa fixes.