 
 (defun fstar-subp-cleanup-issue (issue &optional ov)
   "Fixup ISSUE: include a file name, and adjust line numbers wrt OV."
-  (when (member (fstar-issue-filename issue) '("unknown" "<input>"))
-    (cl-assert buffer-file-name)
-    (setf (fstar-issue-filename issue) buffer-file-name))
-  (unless (or (fstar--has-feature 'absolute-linums-in-errors) (null ov))
-    (let ((linum (1- (line-number-at-pos (overlay-start ov)))))
-      (setf (fstar-issue-line-from issue) (+ (fstar-issue-line-from issue) linum))
-      (setf (fstar-issue-line-to issue) (+ (fstar-issue-line-to issue) linum))))
-  issue)
+  (let ((loc (fstar-issue-loc issue)))
+    (when (member (fstar-location-filename loc) '("unknown" "<input>"))
+      (cl-assert buffer-file-name) ;; FIXME "unknown"
+      (setf (fstar-location-filename loc) buffer-file-name))
+    (unless (or (fstar--has-feature 'absolute-linums-in-errors) (null ov))
+      (let ((linum (1- (line-number-at-pos (overlay-start ov)))))
+        (cl-incf (fstar-location-line-from loc) linum)
+        (cl-incf (fstar-location-line-to loc) linum)))
+    issue))
 
 (defun fstar-subp--in-issue-p (pt)
   "Check if PT is covered by an F* issue overlay."

      (unless (fstar--has-feature 'json-subp)
        (fstar-subp--pop)))))

(cl-defstruct fstar-issue
  level filename line-from line-to col-from col-to message)

(defconst fstar-subp-issue-location-regexp
  "\\(.*?\\)(\\([[:digit:]]+\\),\\([[:digit:]]+\\)-\\([[:digit:]]+\\),\\([[:digit:]]+\\))")

  "Highlight ISSUE in current buffer.
PARENT is the overlay whose processing caused this issue to be
reported."
  (let* ((loc (fstar-issue-loc issue))
         (from (fstar--row-col-offset (fstar-location-line-from loc)
                                 (fstar-location-col-from loc)))
         (to (fstar--row-col-offset (fstar-location-line-to loc)
                               (fstar-location-col-to loc)))
         (overlay (make-overlay from (max to (1+ from)) (current-buffer) t nil)))
    (overlay-put overlay 'fstar-subp-issue t)
    (overlay-put overlay 'fstar-subp-issue-parent-overlay parent)
