I think you are right. Can I pass the expn_info from the surrounding statement to the new span? I've pushed an updated commit with this change.