 
 (defun merlin-sync-to-point (&optional point)
   "Makes sure the buffer is synchronized on merlin-side and centered around (point)."
-  (lexical-let
-      ((point (if point point (point))))
-    (merlin-tell-to-point point)
-    (merlin-seek-exact point)
-    (merlin-sync-lock-zone-display)))
+  (unless point (setq point (point)))
+  (merlin-tell-to-point point)
+  (merlin-seek-exact point)
+  (merlin-sync-lock-zone-display))
 
 ;;;;;;;;;;;;;;;;;;
 ;; ERROR REPORT ;;

(defun merlin-locate ()
  "Locate the identifier under point"
  (interactive)
  (merlin-locate-pure (thing-at-point 'ocaml-atom)))

;; I don't like it beginning by "ac" but
;; it is the only way I found to get it working (otherwise the completion

  (save-excursion
    (if (not (merlin-is-last-user-p))
        (merlin-rewind))
    (unless point (setq point (point)))
    (let ((start (merlin-seek-before merlin-lock-point)))
      (when (< start point)
        (merlin-tell-piece 'struct start point)
