 (defun view-ros-message (message)
   "Open definition of a ros message in view mode.  If used interactively, tab completion will work."
   (interactive (list (ros-completing-read-message
-                      (if (current-word t t)
-                          (format "Enter message name (default %s): " (current-word t t))
-                        "Enter message name: ")
+                      "Enter message name"
                       (current-word t t))))
   (let ((max-mini-window-height 0))
     (shell-command (format "rosmsg show %s" message))))

  (unless ros-actions
    (cache-ros-action-locations))
  (let* ((ros-actions-list (map 'list 'identity ros-actions))
         (result (funcall ros-completion-function prompt
                          (map 'list (lambda (m pkg)
                                       (if (> (count m ros-actions-list :test 'equal) 1)
                                           (format "%s (%s)" m pkg)

  (unless ros-messages
    (cache-ros-message-locations))
  (let* ((ros-messages-list (map 'list 'identity ros-messages))
         (result (funcall ros-completion-function
                          (concatenate 'string prompt
                                       (if (member default ros-messages-list)
                                           (format " (default %s): " default)
                                         ": "))
                          (map 'list (lambda (m pkg)
                                       (if (> (count m ros-messages-list :test 'equal) 1)
                                           (format "%s (%s)" m pkg)
