Untangling a spaghetti web of xrefs and conrefs contributing to issue #39