 (defun company-ycmd--construct-candidate-python (candidate)
   "Construct completion string from a CANDIDATE for python file-types."
   (company-ycmd--with-destructured-candidate candidate
-    (let ((params (and detailed-info
-                       (or (and (string-match "\n" detailed-info)
-                                (substring detailed-info 0 (match-beginning 0)))
-                           detailed-info))))
-      (propertize insertion-text 'meta detailed-info
-                  'kind extra-menu-info 'params params))))
+    (let ((kind (and extra-menu-info (substring extra-menu-info 0 1)))
+          (meta (and detailed-info extra-menu-info
+                     (string-prefix-p "function" extra-menu-info)
+                     (or (and (string-match "\n" detailed-info)
+                              (substring detailed-info 0 (match-beginning 0)))
+                         detailed-info))))
+      (propertize insertion-text 'meta meta 'doc detailed-info 'kind kind))))
 
 (defun company-ycmd--construct-candidate-generic (candidate)
   "Generic function to construct completion string from a CANDIDATE."
-  (company-ycmd--with-destructured-candidate candidate
-    (propertize insertion-text 'return_type extra-menu-info
-                'meta detailed-info 'kind kind 'params menu-text)))
+  (company-ycmd--with-destructured-candidate candidate insertion-text))
 
 (defun company-ycmd--construct-candidates (completion-vector
                                            prefix

  (let ((insertion-text (assoc-default 'insertion_text candidate)))
    (s-starts-with? prefix insertion-text t)))

(defmacro company-ycmd--with-destructured-candidate (candidate body)
  "Destructure CANDIDATE and evaluate BODY."
  (declare (indent 1) (debug t))

  "Insert function arguments after completion for CANDIDATE."
  (--when-let (and (company-ycmd--extended-features-p)
                   company-ycmd-insert-arguments
                   (get-text-property 0 'params candidate))
    (insert it)
    (company-template-c-like-templatify
     (concat candidate it))))
