diff --git a/src/main/java/org/objectweb/asm/ClassWriter.java b/src/main/java/org/objectweb/asm/ClassWriter.java
index 83e08a0..d187974 100644
--- a/src/main/java/org/objectweb/asm/ClassWriter.java
+++ b/src/main/java/org/objectweb/asm/ClassWriter.java
@@ -149,16 +149,19 @@ public class ClassWriter extends ClassVisitor {
 
   /**
    * The last runtime invisible annotation of this class. The previous ones can be accessed with the
+   * {@link AnnotationWriter#previousAnnotation} field. May be {@literal null}.
    */
   private AnnotationWriter lastRuntimeInvisibleAnnotation;
 
   /**
    * The last runtime visible type annotation of this class. The previous ones can be accessed with
+   * the {@link AnnotationWriter#previousAnnotation} field. May be {@literal null}.
    */
   private AnnotationWriter lastRuntimeVisibleTypeAnnotation;
 
   /**
    * The last runtime invisible type annotation of this class. The previous ones can be accessed
+   * with the {@link AnnotationWriter#previousAnnotation} field. May be {@literal null}.
    */
   private AnnotationWriter lastRuntimeInvisibleTypeAnnotation;
 
@@ -441,7 +444,7 @@ public byte[] toByteArray() {
     MethodWriter methodWriter = firstMethod;
     while (methodWriter != null) {
       ++methodsCount;
-      size += methodWriter.computeMethodInfoSize(version & 0xFFFF, version >>> 16);
+      size += methodWriter.computeMethodInfoSize();
       methodWriter = (MethodWriter) methodWriter.mv;
     }
     // For ease of reference, we use here the same attribute order as in Section 4.7 of the JVMS.
@@ -559,7 +562,7 @@ public byte[] toByteArray() {
     while (methodWriter != null) {
       hasFrames |= methodWriter.hasFrames();
       hasAsmInstructions |= methodWriter.hasAsmInstructions();
-      methodWriter.putMethodInfo(result, version & 0xFFFF, version >>> 16);
+      methodWriter.putMethodInfo(result);
       methodWriter = (MethodWriter) methodWriter.mv;
     }
     // For ease of reference, we use here the same attribute order as in Section 4.7 of the JVMS.