                                         (aset name 0 ?~)
                                         (string-prefix-p suffix name)))))
                               labels))
-  ; Format labels
-  (mapcar (lambda (x) (list (cdr (assoc 'name x)) (cdr (assoc 'type x)) "Label" nil))
-          labels))
+  (mapcar (lambda (x) (append x '((kind . "Label") (info . nil)))) labels))
 
 (defun merlin--completion-data (ident)
   "Return the data for completion of IDENT, i.e. a list of pairs (NAME . TYPE)."


(defcustom merlin-completion-types t
  "If non-nil, print the types of the variables during completion with `auto-complete'."
  :group 'merlin :type 'boolean)

(defcustom merlin-debug nil

                 (cons filename linum)))))
          (candidates
           (merlin-sync-to-point)
           (mapcar #'(lambda (x)
                       (propertize
                         (propertize (cdr (assoc 'name x))
                                     'merlin-meta
                                     (merlin--completion-format-entry x))
                         'merlin-arg-type
                         (cdr (assoc 'argument_type x))))
                   (merlin--completion-data arg)))
          (post-completion
            (let ((minibuffer-message-timeout nil))
              (minibuffer-message "%s : %s" arg (get-text-property 0 'merlin-meta arg))))
          (meta
            (let ((arg-type (get-text-property 0 'merlin-arg-type arg))
                  (entry-ty (get-text-property 0 'merlin-meta arg)))
              (if (and merlin-completion-arg-type arg-type)
                (concat "Expected argument type: " arg-type)
                entry-ty)))
          (annotation
           (concat " : " (get-text-property 0 'merlin-meta arg)))
          )))
