diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1FieldReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1FieldReader.kt
index 309e8de..c8e98ad 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1FieldReader.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1FieldReader.kt
@@ -111,7 +111,7 @@ object MCPv1FieldReader : FormatReader {
                     nameMap[dstNs] = fData.first to ns.second
                     val visitor = default.visitField(delegate, nameMap)
                     if (fData.second != null) {
-                        visitor?.visitJavadoc(fData.second!!, dstNs, emptySet())?.visitEnd()
+                        visitor?.visitJavadoc(fData.second!!, setOf(dstNs))?.visitEnd()
                     }
                     return visitor
                 }
@@ -119,10 +119,9 @@ object MCPv1FieldReader : FormatReader {
                 override fun visitFieldJavadoc(
                     delegate: FieldVisitor,
                     value: String,
-                    baseNs: Namespace,
                     namespaces: Set<Namespace>
                 ): JavadocVisitor? {
-                    return default.visitFieldJavadoc(delegate, value, baseNs, namespaces)
+                    return default.visitFieldJavadoc(delegate, value, namespaces)
                 }
 
             })
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1MethodReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1MethodReader.kt
index 6cb52d4..7c6b19e 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1MethodReader.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v1/MCPv1MethodReader.kt
@@ -112,7 +112,7 @@ object MCPv1MethodReader : FormatReader {
                     nameMap[dstNs] = mData.first to ns.second
                     val visitor = default.visitMethod(delegate, nameMap)
                     if (mData.second != null) {
-                        visitor?.visitJavadoc(mData.second!!, dstNs, emptySet())?.visitEnd()
+                        visitor?.visitJavadoc(mData.second!!, setOf(dstNs))?.visitEnd()
                     }
                     return visitor
                 }
@@ -120,10 +120,9 @@ object MCPv1MethodReader : FormatReader {
                 override fun visitMethodJavadoc(
                     delegate: MethodVisitor,
                     value: String,
-                    baseNs: Namespace,
                     namespaces: Set<Namespace>
                 ): JavadocVisitor? {
-                    return default.visitMethodJavadoc(delegate, value, baseNs, namespaces)
+                    return default.visitMethodJavadoc(delegate, value, namespaces)
                 }
 
             })
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldReader.kt
index 19c292a..2837ad9 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldReader.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldReader.kt
@@ -85,7 +85,7 @@ object MCPv6FieldReader : FormatReader {
                     nameMap[dstNs] = fdata.first to ns.second
                     val visitor = default.visitField(delegate, nameMap)
                     if (fdata.second != null) {
-                        visitor?.visitJavadoc(fdata.second!!, dstNs, emptySet())?.visitEnd()
+                        visitor?.visitJavadoc(fdata.second!!, setOf(dstNs))?.visitEnd()
                     }
                     return visitor
                 }
@@ -93,10 +93,9 @@ object MCPv6FieldReader : FormatReader {
                 override fun visitFieldJavadoc(
                     delegate: FieldVisitor,
                     value: String,
-                    baseNs: Namespace,
                     namespaces: Set<Namespace>
                 ): JavadocVisitor? {
-                    return default.visitFieldJavadoc(delegate, value, baseNs, namespaces)
+                    return default.visitFieldJavadoc(delegate, value, namespaces)
                 }
 
             })
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldWriter.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldWriter.kt
index edb3eb4..08fce73 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldWriter.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6FieldWriter.kt
@@ -51,7 +51,6 @@ object MCPv6FieldWriter : FormatWriter {
             override fun visitFieldJavadoc(
                 delegate: FieldVisitor,
                 value: String,
-                baseNs: Namespace,
                 namespaces: Set<Namespace>
             ): JavadocVisitor? {
                 if (!writeComments) return null
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodReader.kt
index 40ba539..d9899c7 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodReader.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodReader.kt
@@ -83,7 +83,7 @@ object MCPv6MethodReader : FormatReader {
                     nameMap[dstNs] = mData.first to ns.second
                     val visitor = default.visitMethod(delegate, nameMap)
                     if (mData.second != null) {
-                        visitor?.visitJavadoc(mData.second!!, dstNs, emptySet())?.visitEnd()
+                        visitor?.visitJavadoc(mData.second!!, setOf(dstNs))?.visitEnd()
                     }
                     return visitor
                 }
@@ -91,10 +91,9 @@ object MCPv6MethodReader : FormatReader {
                 override fun visitMethodJavadoc(
                     delegate: MethodVisitor,
                     value: String,
-                    baseNs: Namespace,
                     namespaces: Set<Namespace>
                 ): JavadocVisitor? {
-                    return default.visitMethodJavadoc(delegate, value, baseNs, namespaces)
+                    return default.visitMethodJavadoc(delegate, value, namespaces)
                 }
 
             })
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodWriter.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodWriter.kt
index 460fe74..a733be0 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodWriter.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/mcp/v6/MCPv6MethodWriter.kt
@@ -51,7 +51,6 @@ object MCPv6MethodWriter : FormatWriter {
             override fun visitMethodJavadoc(
                 delegate: MethodVisitor,
                 value: String,
-                baseNs: Namespace,
                 namespaces: Set<Namespace>
             ): JavadocVisitor? {
                 if (!writeComments) return null
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/parchment/ParchmentReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/parchment/ParchmentReader.kt
index 1446608..bbab3b2 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/parchment/ParchmentReader.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/parchment/ParchmentReader.kt
@@ -48,7 +48,7 @@ object ParchmentReader : FormatReader {
                 }
                 if (content != null) {
                     visitPackage(mapOf(srcNs to PackageName.read("$pkgName/")))?.use {
-                        visitJavadoc(content, srcNs, emptySet())?.visitEnd()
+                        visitJavadoc(content,  setOf(srcNs))?.visitEnd()
                     }
                 }
             }
@@ -72,7 +72,7 @@ object ParchmentReader : FormatReader {
                         }
                         visitMethod(mapOf(srcNs to (methodName to MethodDescriptor.read(methodDesc))))?.use {
                             if (content != null) {
-                                visitJavadoc(content, srcNs, emptySet())?.visitEnd()
+                                visitJavadoc(content, setOf(srcNs))?.visitEnd()
                             }
 
                             val params = methodObj["parameters"]?.jsonArray ?: emptyList()
@@ -88,7 +88,7 @@ object ParchmentReader : FormatReader {
                                 }
                                 visitParameter(null, paramLvOrd, mapOf(srcNs to paramName))?.use {
                                     if (paramContent != null) {
-                                        visitJavadoc(paramContent, srcNs, emptySet())?.visitEnd()
+                                        visitJavadoc(paramContent, setOf(srcNs))?.visitEnd()
                                     }
                                 }
                             }
@@ -109,7 +109,7 @@ object ParchmentReader : FormatReader {
                         }
                         visitField(mapOf(srcNs to (fieldName to FieldDescriptor.read(fieldDesc))))?.use {
                             if (content != null) {
-                                visitJavadoc(content, srcNs, emptySet())?.visitEnd()
+                                visitJavadoc(content, setOf(srcNs))?.visitEnd()
                             }
                         }
                     }
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Reader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Reader.kt
index ea30b9b..ea283e6 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Reader.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Reader.kt
@@ -133,7 +133,7 @@ object TinyV2Reader : FormatReader {
                             // comment
                             val comment = input.takeLine().removePrefix("\t").translateEscapes()
                             last as JavadocParentNode?
-                            last?.visitJavadoc(comment, namespaces.first(), namespaces.drop(1).toSet())
+                            last?.visitJavadoc(comment, namespaces.toSet())
                         }
                     }
 
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Writer.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Writer.kt
index 353a178..3a1d08d 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Writer.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/tiny/v2/TinyV2Writer.kt
@@ -21,7 +21,6 @@ import xyz.wagyourtail.unimined.mapping.visitor.delegate.Delegator
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.NullDelegator
 import xyz.wagyourtail.unimined.mapping.visitor.delegate.delegator
 
-@Suppress("UNUSED_PARAMETER")
 object TinyV2Writer : FormatWriter {
 
     private fun String.escape(): String {
@@ -115,7 +114,6 @@ object TinyV2Writer : FormatWriter {
         override fun visitJavadoc(
             delegate: JavadocParentNode<*>,
             value: String,
-            baseNs: Namespace,
             namespaces: Set<Namespace>
         ): JavadocVisitor? {
             if (indent.isEmpty()) throw IllegalStateException("Top level javadoc?")
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFReader.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFReader.kt
index a3412e3..29d957d 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFReader.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFReader.kt
@@ -294,9 +294,9 @@ object UMFReader : FormatReader {
                 }
                 EntryType.JAVADOC -> {
                     val comment = input.takeNextFixed()!!
-                    val names = input.takeRemainingFixedOnLine().filterNotNull().map { Namespace(it) }.iterator()
+                    val names = input.takeRemainingFixedOnLine().filterNotNull().map { Namespace(it) }
                     last as MemberVisitor<*>?
-                    last?.visitJavadoc(comment, names.next(), names.asSequence().toSet())
+                    last?.visitJavadoc(comment, names.toSet())
                 }
                 EntryType.ANNOTATION -> {
                     val type = input.takeNextFixed()!!.let {
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFWriter.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFWriter.kt
index ac32586..aca8507 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFWriter.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/formats/umf/UMFWriter.kt
@@ -363,14 +363,11 @@ object UMFWriter : FormatWriter {
         override fun visitJavadoc(
             delegate: JavadocParentNode<*>,
             value: String,
-            baseNs: Namespace,
             namespaces: Set<Namespace>
         ): JavadocVisitor? {
             into(indent)
             into("${UMFReader.EntryType.JAVADOC.key}\t")
             into(value.maybeEscape())
-            into("\t")
-            into(baseNs.name.maybeEscape())
             for (ns in this.namespaces) {
                 if (ns in namespaces) {
                     into("\t")
@@ -379,7 +376,7 @@ object UMFWriter : FormatWriter {
             }
             into("\n")
             indent += "\t"
-            return super.visitJavadoc(delegate, value, baseNs, namespaces)
+            return super.visitJavadoc(delegate, value, namespaces)
         }
 
         override fun visitSignature(
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/JavadocNode.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/JavadocNode.kt
index 5a60743..d5976c0 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/JavadocNode.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/JavadocNode.kt
@@ -6,7 +6,7 @@ import xyz.wagyourtail.unimined.mapping.visitor.EmptyJavadocParentVisitor
 import xyz.wagyourtail.unimined.mapping.visitor.JavadocParentNode
 import xyz.wagyourtail.unimined.mapping.visitor.JavadocVisitor
 
-class JavadocNode<T: JavadocParentNode<T>>(parent: BaseNode<T, *>, val value: String, val baseNs: Namespace) : BaseNode<JavadocVisitor, T>(parent), JavadocVisitor {
+class JavadocNode<T: JavadocParentNode<T>>(parent: BaseNode<T, *>, val value: String) : BaseNode<JavadocVisitor, T>(parent), JavadocVisitor {
     val _namespaces: MutableSet<Namespace> = mutableSetOf()
     val namespaces: Set<Namespace> get() = _namespaces
 
@@ -16,20 +16,13 @@ class JavadocNode<T: JavadocParentNode<T>>(parent: BaseNode<T, *>, val value: St
     }
 
     override fun acceptOuter(visitor: T, nsFilter: Collection<Namespace>): JavadocVisitor? {
-        if (baseNs !in nsFilter) {
-            val ns = nsFilter.filter { it in namespaces }.toSet()
-            if (ns.isEmpty()) return null
-            val first = ns.first()
-            return visitor.visitJavadoc(value, first, ns - first)
-        } else {
-            return visitor.visitJavadoc(value, baseNs, nsFilter.filter { it in namespaces }.toSet() - baseNs)
-        }
+        return visitor.visitJavadoc(value, nsFilter.filter { it in namespaces }.toSet())
     }
 
     override fun toString() = buildString {
         val delegator = UMFWriter.UMFWriterDelegator(::append, true)
         delegator.namespaces = root.namespaces
-        delegator.visitJavadoc(EmptyJavadocParentVisitor(), value, baseNs, namespaces)
+        delegator.visitJavadoc(EmptyJavadocParentVisitor(), value, namespaces)
 //        acceptInner(DelegateCommentVisitor(EmptyCommentVisitor(), delegator), root.namespaces)
     }
 
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/_class/member/MemberNode.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/_class/member/MemberNode.kt
index 81859cb..c5a9c86 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/_class/member/MemberNode.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/_class/member/MemberNode.kt
@@ -9,16 +9,16 @@ import xyz.wagyourtail.unimined.mapping.tree.node.JavadocNode
 import xyz.wagyourtail.unimined.mapping.visitor.*
 
 abstract class MemberNode<T: MemberVisitor<T>, U: BaseVisitor<U>>(parent: BaseNode<U, *>) : AccessParentNode<T, U>(parent), MemberVisitor<T> {
-    private var _comments: MutableSet<JavadocNode<T>> = mutableSetOf()
+    private var _comments: MutableMap<String, JavadocNode<T>> = mutableMapOf()
     private val _annotations: MutableSet<AnnotationNode<T>> = mutableSetOf()
 
-    val comments: Set<JavadocNode<T>> get() = _comments
+    val comments: Set<JavadocNode<T>> get() = _comments.values.toSet()
     val annotations: Set<AnnotationNode<T>> get() = _annotations
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        val node = JavadocNode(this, value, baseNs)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        val node = _comments.getOrPut(value) { JavadocNode(this, value) }
         node.addNamespaces(namespaces)
-        _comments.add(node)
+        root.mergeNs(namespaces)
         return node
     }
 
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/_package/PackageNode.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/_package/PackageNode.kt
index e68ab3c..b4220f8 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/_package/PackageNode.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/tree/node/_package/PackageNode.kt
@@ -13,11 +13,11 @@ import xyz.wagyourtail.unimined.mapping.visitor.*
 class PackageNode(parent: AbstractMappingTree) : BaseNode<PackageVisitor, MappingVisitor>(parent), PackageVisitor {
     private val _names: MutableMap<Namespace, PackageName> = mutableMapOf()
     private val _annotations: MutableSet<AnnotationNode<PackageVisitor>> = mutableSetOf()
-    private var _comments: MutableSet<JavadocNode<PackageVisitor>> = mutableSetOf()
+    private var _comments: MutableMap<String, JavadocNode<PackageVisitor>> = mutableMapOf()
 
     val names: Map<Namespace, PackageName> get() = _names
     val annotations: Set<AnnotationNode<PackageVisitor>> get() = _annotations
-    val comments: Set<JavadocNode<PackageVisitor>> get() = _comments
+    val comments: Set<JavadocNode<PackageVisitor>> get() = _comments.values.toSet()
 
     fun getName(namespace: Namespace) = names[namespace]
 
@@ -52,11 +52,10 @@ class PackageNode(parent: AbstractMappingTree) : BaseNode<PackageVisitor, Mappin
         return node
     }
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor {
-        val node = JavadocNode(this, value, baseNs)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor {
+        val node = _comments.getOrPut(value) { JavadocNode(this, value) }
         node.addNamespaces(namespaces)
-        _comments.add(node)
-        root.mergeNs(namespaces + baseNs)
+        root.mergeNs(namespaces)
         return node
     }
 
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/EmptyMappingVisitor.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/EmptyMappingVisitor.kt
index 1801bcd..46c2fdd 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/EmptyMappingVisitor.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/EmptyMappingVisitor.kt
@@ -79,7 +79,7 @@ open class EmptySignatureParentVisitor<T: SignatureParentVisitor<T>> :  EmptyBas
 
 open class EmptyJavadocParentVisitor<T: JavadocParentNode<T>> : EmptyBaseVisitor<T>(), JavadocParentNode<T> {
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
         return EmptyJavadocVisitor()
     }
 
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/MappingVisitor.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/MappingVisitor.kt
index 843a7c3..eaa3eea 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/MappingVisitor.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/MappingVisitor.kt
@@ -61,7 +61,7 @@ interface SignatureParentVisitor<T: SignatureParentVisitor<T>> : BaseVisitor<T>
 
 interface JavadocParentNode<T: JavadocParentNode<T>> : BaseVisitor<T> {
 
-    fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor?
+    fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor?
 
 }
 
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/DelegateVisitor.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/DelegateVisitor.kt
index 32cfe4a..fe15b2f 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/DelegateVisitor.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/DelegateVisitor.kt
@@ -185,41 +185,41 @@ open class Delegator(delegator: Delegator? = null) {
         return visitAccess(delegate, type, value, conditions, namespaces)
     }
 
-    open fun visitJavadoc(delegate: JavadocParentNode<*>, value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return delegate.visitJavadoc(value, baseNs, namespaces)?.let { DelegateJavadocVisitor(it, delegator) }
+    open fun visitJavadoc(delegate: JavadocParentNode<*>, value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return delegate.visitJavadoc(value, namespaces)?.let { DelegateJavadocVisitor(it, delegator) }
     }
 
     open fun visitJavadocEnd(delegate: JavadocVisitor) {
         visitEnd(delegate)
     }
 
-    open fun visitPackageJavadoc(delegate: PackageVisitor, value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return visitJavadoc(delegate, value, baseNs, namespaces)
+    open fun visitPackageJavadoc(delegate: PackageVisitor, value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return visitJavadoc(delegate, value, namespaces)
     }
 
 
-    open fun visitClassJavadoc(delegate: ClassVisitor, value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return visitJavadoc(delegate, value, baseNs, namespaces)
+    open fun visitClassJavadoc(delegate: ClassVisitor, value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return visitJavadoc(delegate, value, namespaces)
     }
 
-    open fun visitMethodJavadoc(delegate: MethodVisitor,value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return visitJavadoc(delegate, value, baseNs, namespaces)
+    open fun visitMethodJavadoc(delegate: MethodVisitor,value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return visitJavadoc(delegate, value, namespaces)
     }
 
-    open fun visitWildcardJavadoc(delegate: WildcardVisitor, value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return visitJavadoc(delegate, value, baseNs, namespaces)
+    open fun visitWildcardJavadoc(delegate: WildcardVisitor, value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return visitJavadoc(delegate, value, namespaces)
     }
 
-    open fun visitFieldJavadoc(delegate: FieldVisitor, value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return visitJavadoc(delegate, value, baseNs, namespaces)
+    open fun visitFieldJavadoc(delegate: FieldVisitor, value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return visitJavadoc(delegate, value, namespaces)
     }
 
-    open fun visitParameterJavadoc(delegate: ParameterVisitor, value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return visitJavadoc(delegate, value, baseNs, namespaces)
+    open fun visitParameterJavadoc(delegate: ParameterVisitor, value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return visitJavadoc(delegate, value, namespaces)
     }
 
-    open fun visitLocalVariableJavadoc(delegate: LocalVariableVisitor, value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return visitJavadoc(delegate, value, baseNs, namespaces)
+    open fun visitLocalVariableJavadoc(delegate: LocalVariableVisitor, value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return visitJavadoc(delegate, value, namespaces)
     }
 
     open fun visitSignature(
@@ -355,8 +355,8 @@ open class DelegateMappingVisitor(delegate: MappingVisitor, delegator: Delegator
 
 open class DelegatePackageVisitor(delegate: PackageVisitor, delegator: Delegator) : DelegateBaseVisitor<PackageVisitor>(delegate, delegator), PackageVisitor by delegate {
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return delegator.visitPackageJavadoc(delegate, value, baseNs, namespaces)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return delegator.visitPackageJavadoc(delegate, value, namespaces)
     }
 
     override fun visitEnd() {
@@ -401,8 +401,8 @@ open class DelegateClassVisitor(delegate: ClassVisitor, delegator: Delegator) :
         return delegator.visitInterface(delegate, type, name, baseNs, namespaces)
     }
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return delegator.visitClassJavadoc(delegate, value, baseNs, namespaces)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return delegator.visitClassJavadoc(delegate, value, namespaces)
     }
 
     override fun visitSignature(value: String, baseNs: Namespace, namespaces: Set<Namespace>): SignatureVisitor? {
@@ -474,8 +474,8 @@ open class DelegateMethodVisitor(delegate: MethodVisitor, delegator: Delegator)
         return delegator.visitMethodException(delegate, type, exception, baseNs, namespaces)
     }
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return delegator.visitMethodJavadoc(delegate, value, baseNs, namespaces)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return delegator.visitMethodJavadoc(delegate, value, namespaces)
     }
 
     override fun visitEnd() {
@@ -508,8 +508,8 @@ open class DelegateFieldVisitor(delegate: FieldVisitor, delegator: Delegator) :
         return delegator.visitFieldSignature(delegate, value, baseNs, namespaces)
     }
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return delegator.visitFieldJavadoc(delegate, value, baseNs, namespaces)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return delegator.visitFieldJavadoc(delegate, value, namespaces)
     }
 
     override fun visitEnd() {
@@ -554,8 +554,8 @@ open class DelegateWildcardVisitor(delegate: WildcardVisitor, delegator: Delegat
         return delegator.visitWildcardAnnotation(delegate, type, baseNs, annotation, namespaces)
     }
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return delegator.visitWildcardJavadoc(delegate, value, baseNs, namespaces)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return delegator.visitWildcardJavadoc(delegate, value, namespaces)
     }
 
     override fun visitSignature(value: String, baseNs: Namespace, namespaces: Set<Namespace>): SignatureVisitor? {
@@ -570,8 +570,8 @@ open class DelegateWildcardVisitor(delegate: WildcardVisitor, delegator: Delegat
 
 open class DelegateParameterVisitor(delegate: ParameterVisitor, delegator: Delegator) : DelegateBaseVisitor<ParameterVisitor>(delegate, delegator), ParameterVisitor {
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return delegator.visitParameterJavadoc(delegate, value, baseNs, namespaces)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return delegator.visitParameterJavadoc(delegate, value, namespaces)
     }
 
     override fun visitAccess(
@@ -618,8 +618,8 @@ open class DelegateLocalVariableVisitor(delegate: LocalVariableVisitor, delegato
         return delegator.visitLocalVariableAnnotation(delegate, type, baseNs, annotation, namespaces)
     }
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        return delegator.visitLocalVariableJavadoc(delegate, value, baseNs, namespaces)
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        return delegator.visitLocalVariableJavadoc(delegate, value, namespaces)
     }
 
     override fun visitEnd() {
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/MetadataCopyVisitor.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/MetadataCopyVisitor.kt
index 0e6bcb0..8688bb2 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/MetadataCopyVisitor.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/MetadataCopyVisitor.kt
@@ -29,13 +29,12 @@ private class MetadataCopyVisitor(val from: Namespace, val to: Set<Namespace>, v
     override fun visitJavadoc(
         delegate: JavadocParentNode<*>,
         value: String,
-        baseNs: Namespace,
         namespaces: Set<Namespace>
     ): JavadocVisitor? {
-        if (baseNs == from || from in namespaces) {
-            return super.visitJavadoc(delegate, value, baseNs, namespaces + to)
+        if (from in namespaces) {
+            return super.visitJavadoc(delegate, value, namespaces + to)
         }
-        return super.visitJavadoc(delegate, value, baseNs, namespaces)
+        return super.visitJavadoc(delegate, value, namespaces)
     }
 
     override fun visitException(
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/MultiVisitor.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/MultiVisitor.kt
index 7a733df..0743e56 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/MultiVisitor.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/MultiVisitor.kt
@@ -101,8 +101,8 @@ open class MultiSignatureParentVisitor<T: SignatureParentVisitor<T>>(visitors: L
 
 open class MultiJavadocParentVisitor<T: JavadocParentNode<T>>(visitors: List<T>): MultiBaseVisitor<T>(visitors), JavadocParentNode<T> {
 
-    override fun visitJavadoc(value: String, baseNs: Namespace, namespaces: Set<Namespace>): JavadocVisitor? {
-        val visitors = visitors.mapNotNull { it.visitJavadoc(value, baseNs, namespaces) }
+    override fun visitJavadoc(value: String, namespaces: Set<Namespace>): JavadocVisitor? {
+        val visitors = visitors.mapNotNull { it.visitJavadoc(value, namespaces) }
         if (visitors.isEmpty()) return null
         return MultiJavadocVisitor(visitors)
     }
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NamespaceRecordingVisitor.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NamespaceRecordingVisitor.kt
index eee4d7b..b117a9e 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NamespaceRecordingVisitor.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NamespaceRecordingVisitor.kt
@@ -142,11 +142,10 @@ class NamespaceRecordingDelegate(val recorder: (Set<Namespace>) -> Unit) : Deleg
     override fun visitJavadoc(
         delegate: JavadocParentNode<*>,
         value: String,
-        baseNs: Namespace,
         namespaces: Set<Namespace>
     ): JavadocVisitor? {
-        recorder(namespaces + baseNs)
-        return super.visitJavadoc(delegate, value, baseNs, namespaces)
+        recorder(namespaces)
+        return super.visitJavadoc(delegate, value, namespaces)
     }
 
     override fun visitSignature(
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NsFilteredVisitor.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NsFilteredVisitor.kt
index 08d5eaa..6bcbc82 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NsFilteredVisitor.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NsFilteredVisitor.kt
@@ -144,11 +144,9 @@ class NsFilteredDelegate(val ns: Set<Namespace>, val inverted: Boolean) : Delega
     override fun visitJavadoc(
         delegate: JavadocParentNode<*>,
         value: String,
-        baseNs: Namespace,
         namespaces: Set<Namespace>
     ): JavadocVisitor? {
-        if (baseNs !in ns) return null
-        return super.visitJavadoc(delegate, value, baseNs, namespaces.filter { if (inverted) it !in ns else it in ns }.toSet())
+        return super.visitJavadoc(delegate, value, namespaces.filter { if (inverted) it !in ns else it in ns }.toSet())
     }
 
     override fun visitSignature(
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NullDelegator.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NullDelegator.kt
index e75eb5d..03dcb05 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NullDelegator.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/NullDelegator.kt
@@ -85,7 +85,6 @@ open class NullDelegator : Delegator() {
     override fun visitJavadoc(
         delegate: JavadocParentNode<*>,
         value: String,
-        baseNs: Namespace,
         namespaces: Set<Namespace>
     ): JavadocVisitor? {
         return null
diff --git a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/Visitors.kt b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/Visitors.kt
index 7f02943..a51de95 100644
--- a/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/Visitors.kt
+++ b/src/commonMain/kotlin/xyz/wagyourtail/unimined/mapping/visitor/delegate/Visitors.kt
@@ -141,12 +141,11 @@ fun MappingVisitor.mapNs(nsMap: Map<Namespace, Namespace>) = DelegateMappingVisi
     override fun visitJavadoc(
         delegate: JavadocParentNode<*>,
         value: String,
-        baseNs: Namespace,
         namespaces: Set<Namespace>
     ): JavadocVisitor? {
         val n = namespaces.map { nsMap[it] ?: it }.toSet()
         if (n.isEmpty()) return null
-        return super.visitJavadoc(delegate, value, nsMap[baseNs] ?: baseNs, n)
+        return super.visitJavadoc(delegate, value, n)
     }
 
     override fun visitSignature(