I think the ideal thing would be to record the source line number as a comment (except that lisp doesn't do /* ..*/ style comments).  Happy to drop the code though.