emacs: fix auto configuration of merlin-favourite-caml-mode
emacs: minor code cleanup