Minor code improvements

* add compiler flag -Xlint:all, resolve all warnings about unchecked or raw generics
* rename IInstance.get() to IInstance.self() because it better reflects its intention
* move MainTag from manual to generated tags
* remove unnecessary type casts in TagCreator

code_gen/src/main/java/j2html_codegen/generators/AttributeInterfaceCodeGenerator.java

@@ -3,8 +3,6 @@ package j2html_codegen.generators;
 import j2html_codegen.GeneratorUtil;
 import j2html_codegen.model.AttrD;
 import j2html_codegen.model.AttributesList;
-
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -25,13 +23,12 @@ public final class AttributeInterfaceCodeGenerator {
 
         for (final AttrD attr : AttributesList.attributesDescriptive()) {
             final Path path = makePath(attr.attr, absPath);
-            final String interfaceName = interfaceNameFromAttribute(attr.attr)+"<T extends Tag>";
+            final String interfaceName = interfaceNameFromAttribute(attr.attr)+"<T extends Tag<T>>";
             /*
-            IFormAction<T extends Tag> extends IInstance<T>
+            IFormAction<T extends Tag<T>> extends IInstance<T>
 
             default T withFormAction(String formAction){
-                get().attr("formaction", formAction);
-                return get();
+                return self().attr("formaction", formAction);
             }
              */
             final String interfaceStr = getInterfaceTemplate(
@@ -78,10 +75,7 @@ public final class AttributeInterfaceCodeGenerator {
         sb.append("public interface ")
             .append(interfaceName);
 
-        if(optExtends.isPresent()) {
-            sb.append(" extends ").append(optExtends.get())
-                .append(" ");
-        }
+        optExtends.ifPresent(ext -> sb.append(" extends ").append(ext).append(" "));
 
         sb.append(" {\n");
 
@@ -90,8 +84,7 @@ public final class AttributeInterfaceCodeGenerator {
         IFormAction<T extends Tag> extends IInstance<T>
 
         default T withFormAction(String formAction){
-            get().attr("formaction", formAction);
-            return get();
+            return self().attr("formaction", formAction);
         }
          */
         //IMPORTANT: '_' added as suffix to mitigate problems
@@ -119,11 +112,10 @@ public final class AttributeInterfaceCodeGenerator {
         //there are some special attributes
         //which do take an argument, but where the argument
         //is boolean (meaning on/off, yes/no and the like)
-        sb.append("get().attr(\"");
-        if(attrName.equals("autocomplete")){
+        sb.append("self().attr(\"");
+        if (attrName.equals("autocomplete")){
             sb.append(attrName).append("\",\"on\"");
-        }else {
-
+        } else {
             sb.append(attrName).append("\"");
         }
         sb.append(");\n");
@@ -139,10 +131,10 @@ public final class AttributeInterfaceCodeGenerator {
             sb.append("(final boolean enable, final String ").append(paramName).append(") {");
 
                 sb.append("if (enable){\n");
-                    sb.append("get().attr(\"").append(attrName).append("\", "+ paramName +");\n");
+                    sb.append("self().attr(\"").append(attrName).append("\", ").append(paramName).append(");\n");
                 sb.append("}\n");
 
-                sb.append("return get();\n");
+                sb.append("return self();\n");
         }else{
             //add a variant where you can toggle the attribute
 
@@ -150,7 +142,7 @@ public final class AttributeInterfaceCodeGenerator {
                 sb.append("if (enable){\n");
                     addAttributeNoArg(sb, attrName);
                 sb.append("}\n");
-                sb.append("return get();\n");
+                sb.append("return self();\n");
         }
         sb.append("}\n");
     }
@@ -166,8 +158,7 @@ public final class AttributeInterfaceCodeGenerator {
 
             sb.append("(final String ").append(paramName).append(") {")
 
-                .append("get().attr(\"").append(attrName).append("\", "+ paramName +");\n")
-                .append("return get();\n");
+                .append("return self().attr(\"").append(attrName).append("\", ").append(paramName).append(");\n");
         }else{
             //add a variant where you can toggle the attribute
 
@@ -175,7 +166,7 @@ public final class AttributeInterfaceCodeGenerator {
 
                 addAttributeNoArg(sb, attrName);
 
-                sb.append("return get();\n");
+                sb.append("return self();\n");
         }
         sb.append("}\n");
     }

code_gen/src/main/java/j2html_codegen/generators/SpecializedTagClassCodeGenerator.java

@@ -126,10 +126,7 @@ public final class SpecializedTagClassCodeGenerator {
             .append(className)
             .append(" ");
 
-        if(optExtends.isPresent()) {
-                sb.append("extends ").append(optExtends.get())
-                .append(" ");
-        }
+        optExtends.ifPresent(ext -> sb.append("extends ").append(ext).append(" "));
 
         //add the 'implements' clause
         if(!interfaces.isEmpty()) {

code_gen/src/main/java/j2html_codegen/generators/TagCreatorCodeGenerator.java

@@ -23,7 +23,7 @@ public final class TagCreatorCodeGenerator {
             // Print
             System.out.println(String.format("%-80s%1s", emptyA1, emptyA2));
             System.out.println(String.format("%-80s%1s", emptyB1, emptyB2));
-            System.out.println("");
+            System.out.println();
         }
 
         System.out.println("// ContainerTags, generated in " + TagCreatorCodeGenerator.class);
@@ -58,7 +58,7 @@ public final class TagCreatorCodeGenerator {
             System.out.println(String.format("%-80s%1s", containerD1, containerD2));
             System.out.println(String.format("%-80s%1s", containerE1, containerE2));
             System.out.println(String.format("%-80s%1s", containerF1, containerF2));
-            System.out.println("");
+            System.out.println();
         }
     }
 
@@ -135,6 +135,7 @@ public final class TagCreatorCodeGenerator {
             "legend",
             "li",
             "generate",
+            "main",
             "map",
             "mark",
             "menu",

library/pom.xml

@@ -87,6 +87,9 @@
                     <source>1.8</source>
                     <target>1.8</target>
                     <optimize>true</optimize>
+                    <compilerArgs>
+                        <arg>-Xlint:all</arg>
+                    </compilerArgs>
                 </configuration>
             </plugin>
             <plugin>

library/src/main/java/j2html/tags/ContainerTag.java

@@ -32,11 +32,11 @@ public class ContainerTag<T extends ContainerTag<T>> extends Tag<T> {
         if (this == child) {
             throw new RuntimeException("Cannot append a tag to itself.");
         }
-        if (child == null) {
-            return (T)this; // in some cases, like when using iff(), we ignore null children
+        if (child != null) {
+            // in some cases, like when using iff(), we ignore null children
+            children.add(child);
         }
-        children.add(child);
-        return (T)this;
+        return self();
     }
 
 
@@ -49,7 +49,7 @@ public class ContainerTag<T extends ContainerTag<T>> extends Tag<T> {
      * @return itself for easy chaining
      */
     public T condWith(boolean condition, DomContent child) {
-        return condition ? this.with(child) : (T)this;
+        return condition ? this.with(child) : self();
     }
 
 
@@ -65,7 +65,7 @@ public class ContainerTag<T extends ContainerTag<T>> extends Tag<T> {
                 this.with(child);
             }
         }
-        return (T)this;
+        return self();
     }
 
 
@@ -78,7 +78,7 @@ public class ContainerTag<T extends ContainerTag<T>> extends Tag<T> {
      * @return itself for easy chaining
      */
     public T condWith(boolean condition, Iterable<? extends DomContent> children) {
-        return condition ? this.with(children) : (T)this;
+        return condition ? this.with(children) : self();
     }
 
 
@@ -92,7 +92,7 @@ public class ContainerTag<T extends ContainerTag<T>> extends Tag<T> {
         for (DomContent child : children) {
             with(child);
         }
-        return (T)this;
+        return self();
     }
 
 
@@ -104,7 +104,7 @@ public class ContainerTag<T extends ContainerTag<T>> extends Tag<T> {
      */
     public T with(Stream<DomContent> children) {
         children.forEach(this::with);
-        return (T)this;
+        return self();
     }
 
 
@@ -117,7 +117,7 @@ public class ContainerTag<T extends ContainerTag<T>> extends Tag<T> {
      * @return itself for easy chaining
      */
     public T condWith(boolean condition, DomContent... children) {
-        return condition ? this.with(children) : (T)this;
+        return condition ? this.with(children) : self();
     }
 
 

library/src/main/java/j2html/tags/IInstance.java

@@ -4,11 +4,12 @@ public interface IInstance<T> {
 
     //to get the actual instance
     // (every implementing class would have to implement: { return this; }
-    // public T get();
+    // public T self();
 
     // this method shows up in autocomplete.
     // this is really undesireable as it does not do anything.
-    default T get() {
+    @SuppressWarnings("unchecked")
+    default T self() {
         //we know that the implementing class will supply
         //its own type as the type argument.
         //therefore every instance of IInstance can assume it

library/src/main/java/j2html/tags/InlineStaticResource.java

@@ -4,13 +4,14 @@ import j2html.Config;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.util.Scanner;
+
 import static j2html.TagCreator.rawHtml;
 import static j2html.TagCreator.script;
 import static j2html.TagCreator.style;
 
 public class InlineStaticResource {
 
-    public static ContainerTag get(String path, TargetFormat format) {
+    public static ContainerTag<? extends Tag<?>> get(String path, TargetFormat format) {
         String fileString = getFileAsString(path);
         switch (format) {
             case CSS_MIN:

library/src/main/java/j2html/tags/Tag.java

@@ -5,9 +5,9 @@ import j2html.attributes.Attribute;
 import java.util.ArrayList;
 import java.util.Iterator;
 
-public abstract class Tag<T extends Tag<T>> extends DomContent {
-    protected String tagName;
-    private ArrayList<Attribute> attributes;
+public abstract class Tag<T extends Tag<T>> extends DomContent implements IInstance<T> {
+    private final String tagName;
+    private final ArrayList<Attribute> attributes;
 
     protected Tag(String tagName) {
         this.tagName = tagName;
@@ -54,7 +54,7 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
      */
     public T attr(String attribute, Object value) {
         setAttribute(attribute, value == null ? null : String.valueOf(value));
-        return (T) this;
+        return self();
     }
 
     /**
@@ -76,7 +76,7 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
             }
         }
         attributes.add(attribute);
-        return (T) this;
+        return self();
     }
 
     /**
@@ -100,15 +100,15 @@ public abstract class Tag<T extends Tag<T>> extends DomContent {
      * @return itself for easy chaining
      */
     public T condAttr(boolean condition, String attribute, String value) {
-        return (condition ? attr(attribute, value) : (T) this);
+        return (condition ? attr(attribute, value) : self());
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj == null || !(obj instanceof Tag)) {
+        if (!(obj instanceof Tag)) {
             return false;
         }
-        return ((Tag) obj).render().equals(this.render());
+        return ((Tag<?>) obj).render().equals(this.render());
     }
 
     /**

library/src/main/java/j2html/tags/Text.java

@@ -8,7 +8,7 @@ import java.io.IOException;
 
 public class Text extends DomContent {
 
-    private String text;
+    private final String text;
 
     public Text(String text) {
         this.text = text;

library/src/main/java/j2html/tags/UnescapedText.java

@@ -8,7 +8,7 @@ import java.io.IOException;
 
 public class UnescapedText extends DomContent {
 
-    private String text;
+    private final String text;
 
     public UnescapedText(String text) {
         this.text = text;

library/src/main/java/j2html/tags/attributes/IAccept.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IAccept<T extends Tag> extends IInstance<T> {
+public interface IAccept<T extends Tag<T>> extends IInstance<T> {
     default T withAccept(final String accept_) {
-        get().attr("accept", accept_);
-        return get();
+        return self().attr("accept", accept_);
     }
 
     default T withCondAccept(final boolean enable, final String accept_) {
         if (enable) {
-            get().attr("accept", accept_);
+            self().attr("accept", accept_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IAction.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IAction<T extends Tag> extends IInstance<T> {
+public interface IAction<T extends Tag<T>> extends IInstance<T> {
     default T withAction(final String action_) {
-        get().attr("action", action_);
-        return get();
+        return self().attr("action", action_);
     }
 
     default T withCondAction(final boolean enable, final String action_) {
         if (enable) {
-            get().attr("action", action_);
+            self().attr("action", action_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IAlt.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IAlt<T extends Tag> extends IInstance<T> {
+public interface IAlt<T extends Tag<T>> extends IInstance<T> {
     default T withAlt(final String alt_) {
-        get().attr("alt", alt_);
-        return get();
+        return self().attr("alt", alt_);
     }
 
     default T withCondAlt(final boolean enable, final String alt_) {
         if (enable) {
-            get().attr("alt", alt_);
+            self().attr("alt", alt_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IAsync.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IAsync<T extends Tag> extends IInstance<T> {
+public interface IAsync<T extends Tag<T>> extends IInstance<T> {
     default T isAsync() {
-        get().attr("async");
-        return get();
+        self().attr("async");
+        return self();
     }
 
     default T withCondAsync(final boolean enable) {
         if (enable) {
-            get().attr("async");
+            self().attr("async");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IAutocomplete.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IAutocomplete<T extends Tag> extends IInstance<T> {
+public interface IAutocomplete<T extends Tag<T>> extends IInstance<T> {
     default T isAutocomplete() {
-        get().attr("autocomplete", "on");
-        return get();
+        self().attr("autocomplete", "on");
+        return self();
     }
 
     default T withCondAutocomplete(final boolean enable) {
         if (enable) {
-            get().attr("autocomplete", "on");
+            self().attr("autocomplete", "on");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IAutofocus.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IAutofocus<T extends Tag> extends IInstance<T> {
+public interface IAutofocus<T extends Tag<T>> extends IInstance<T> {
     default T isAutofocus() {
-        get().attr("autofocus");
-        return get();
+        self().attr("autofocus");
+        return self();
     }
 
     default T withCondAutofocus(final boolean enable) {
         if (enable) {
-            get().attr("autofocus");
+            self().attr("autofocus");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IAutoplay.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IAutoplay<T extends Tag> extends IInstance<T> {
+public interface IAutoplay<T extends Tag<T>> extends IInstance<T> {
     default T isAutoplay() {
-        get().attr("autoplay");
-        return get();
+        self().attr("autoplay");
+        return self();
     }
 
     default T withCondAutoplay(final boolean enable) {
         if (enable) {
-            get().attr("autoplay");
+            self().attr("autoplay");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/ICharset.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface ICharset<T extends Tag> extends IInstance<T> {
+public interface ICharset<T extends Tag<T>> extends IInstance<T> {
     default T withCharset(final String charset_) {
-        get().attr("charset", charset_);
-        return get();
+        return self().attr("charset", charset_);
     }
 
     default T withCondCharset(final boolean enable, final String charset_) {
         if (enable) {
-            get().attr("charset", charset_);
+            self().attr("charset", charset_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IChecked.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IChecked<T extends Tag> extends IInstance<T> {
+public interface IChecked<T extends Tag<T>> extends IInstance<T> {
     default T isChecked() {
-        get().attr("checked");
-        return get();
+        self().attr("checked");
+        return self();
     }
 
     default T withCondChecked(final boolean enable) {
         if (enable) {
-            get().attr("checked");
+            self().attr("checked");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/ICite.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface ICite<T extends Tag> extends IInstance<T> {
+public interface ICite<T extends Tag<T>> extends IInstance<T> {
     default T withCite(final String cite_) {
-        get().attr("cite", cite_);
-        return get();
+        return self().attr("cite", cite_);
     }
 
     default T withCondCite(final boolean enable, final String cite_) {
         if (enable) {
-            get().attr("cite", cite_);
+            self().attr("cite", cite_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/ICols.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface ICols<T extends Tag> extends IInstance<T> {
+public interface ICols<T extends Tag<T>> extends IInstance<T> {
     default T withCols(final String cols_) {
-        get().attr("cols", cols_);
-        return get();
+        return self().attr("cols", cols_);
     }
 
     default T withCondCols(final boolean enable, final String cols_) {
         if (enable) {
-            get().attr("cols", cols_);
+            self().attr("cols", cols_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IColspan.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IColspan<T extends Tag> extends IInstance<T> {
+public interface IColspan<T extends Tag<T>> extends IInstance<T> {
     default T withColspan(final String colspan_) {
-        get().attr("colspan", colspan_);
-        return get();
+        return self().attr("colspan", colspan_);
     }
 
     default T withCondColspan(final boolean enable, final String colspan_) {
         if (enable) {
-            get().attr("colspan", colspan_);
+            self().attr("colspan", colspan_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IContent.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IContent<T extends Tag> extends IInstance<T> {
+public interface IContent<T extends Tag<T>> extends IInstance<T> {
     default T withContent(final String content_) {
-        get().attr("content", content_);
-        return get();
+        return self().attr("content", content_);
     }
 
     default T withCondContent(final boolean enable, final String content_) {
         if (enable) {
-            get().attr("content", content_);
+            self().attr("content", content_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IControls.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IControls<T extends Tag> extends IInstance<T> {
+public interface IControls<T extends Tag<T>> extends IInstance<T> {
     default T isControls() {
-        get().attr("controls");
-        return get();
+        self().attr("controls");
+        return self();
     }
 
     default T withCondControls(final boolean enable) {
         if (enable) {
-            get().attr("controls");
+            self().attr("controls");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/ICoords.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface ICoords<T extends Tag> extends IInstance<T> {
+public interface ICoords<T extends Tag<T>> extends IInstance<T> {
     default T withCoords(final String coords_) {
-        get().attr("coords", coords_);
-        return get();
+        return self().attr("coords", coords_);
     }
 
     default T withCondCoords(final boolean enable, final String coords_) {
         if (enable) {
-            get().attr("coords", coords_);
+            self().attr("coords", coords_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IData.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IData<T extends Tag> extends IInstance<T> {
+public interface IData<T extends Tag<T>> extends IInstance<T> {
     default T withData(final String data_) {
-        get().attr("data", data_);
-        return get();
+        return self().attr("data", data_);
     }
 
     default T withCondData(final boolean enable, final String data_) {
         if (enable) {
-            get().attr("data", data_);
+            self().attr("data", data_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IDatetime.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IDatetime<T extends Tag> extends IInstance<T> {
+public interface IDatetime<T extends Tag<T>> extends IInstance<T> {
     default T withDatetime(final String datetime_) {
-        get().attr("datetime", datetime_);
-        return get();
+        return self().attr("datetime", datetime_);
     }
 
     default T withCondDatetime(final boolean enable, final String datetime_) {
         if (enable) {
-            get().attr("datetime", datetime_);
+            self().attr("datetime", datetime_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IDefault.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IDefault<T extends Tag> extends IInstance<T> {
+public interface IDefault<T extends Tag<T>> extends IInstance<T> {
     default T isDefault() {
-        get().attr("default");
-        return get();
+        self().attr("default");
+        return self();
     }
 
     default T withCondDefault(final boolean enable) {
         if (enable) {
-            get().attr("default");
+            self().attr("default");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IDefer.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IDefer<T extends Tag> extends IInstance<T> {
+public interface IDefer<T extends Tag<T>> extends IInstance<T> {
     default T isDefer() {
-        get().attr("defer");
-        return get();
+        self().attr("defer");
+        return self();
     }
 
     default T withCondDefer(final boolean enable) {
         if (enable) {
-            get().attr("defer");
+            self().attr("defer");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IDirname.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IDirname<T extends Tag> extends IInstance<T> {
+public interface IDirname<T extends Tag<T>> extends IInstance<T> {
     default T withDirname(final String dirname_) {
-        get().attr("dirname", dirname_);
-        return get();
+        return self().attr("dirname", dirname_);
     }
 
     default T withCondDirname(final boolean enable, final String dirname_) {
         if (enable) {
-            get().attr("dirname", dirname_);
+            self().attr("dirname", dirname_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IDisabled.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IDisabled<T extends Tag> extends IInstance<T> {
+public interface IDisabled<T extends Tag<T>> extends IInstance<T> {
     default T isDisabled() {
-        get().attr("disabled");
-        return get();
+        self().attr("disabled");
+        return self();
     }
 
     default T withCondDisabled(final boolean enable) {
         if (enable) {
-            get().attr("disabled");
+            self().attr("disabled");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IDownload.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IDownload<T extends Tag> extends IInstance<T> {
+public interface IDownload<T extends Tag<T>> extends IInstance<T> {
     default T isDownload() {
-        get().attr("download");
-        return get();
+        self().attr("download");
+        return self();
     }
 
     default T withCondDownload(final boolean enable) {
         if (enable) {
-            get().attr("download");
+            self().attr("download");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IEnctype.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IEnctype<T extends Tag> extends IInstance<T> {
+public interface IEnctype<T extends Tag<T>> extends IInstance<T> {
     default T withEnctype(final String enctype_) {
-        get().attr("enctype", enctype_);
-        return get();
+        return self().attr("enctype", enctype_);
     }
 
     default T withCondEnctype(final boolean enable, final String enctype_) {
         if (enable) {
-            get().attr("enctype", enctype_);
+            self().attr("enctype", enctype_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IFor.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IFor<T extends Tag> extends IInstance<T> {
+public interface IFor<T extends Tag<T>> extends IInstance<T> {
     default T withFor(final String for_) {
-        get().attr("for", for_);
-        return get();
+        return self().attr("for", for_);
     }
 
     default T withCondFor(final boolean enable, final String for_) {
         if (enable) {
-            get().attr("for", for_);
+            self().attr("for", for_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IForm.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IForm<T extends Tag> extends IInstance<T> {
+public interface IForm<T extends Tag<T>> extends IInstance<T> {
     default T withForm(final String form_) {
-        get().attr("form", form_);
-        return get();
+        return self().attr("form", form_);
     }
 
     default T withCondForm(final boolean enable, final String form_) {
         if (enable) {
-            get().attr("form", form_);
+            self().attr("form", form_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IFormaction.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IFormaction<T extends Tag> extends IInstance<T> {
+public interface IFormaction<T extends Tag<T>> extends IInstance<T> {
     default T withFormaction(final String formaction_) {
-        get().attr("formaction", formaction_);
-        return get();
+        return self().attr("formaction", formaction_);
     }
 
     default T withCondFormaction(final boolean enable, final String formaction_) {
         if (enable) {
-            get().attr("formaction", formaction_);
+            self().attr("formaction", formaction_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IHeaders.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IHeaders<T extends Tag> extends IInstance<T> {
+public interface IHeaders<T extends Tag<T>> extends IInstance<T> {
     default T withHeaders(final String headers_) {
-        get().attr("headers", headers_);
-        return get();
+        return self().attr("headers", headers_);
     }
 
     default T withCondHeaders(final boolean enable, final String headers_) {
         if (enable) {
-            get().attr("headers", headers_);
+            self().attr("headers", headers_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IHeight.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IHeight<T extends Tag> extends IInstance<T> {
+public interface IHeight<T extends Tag<T>> extends IInstance<T> {
     default T withHeight(final String height_) {
-        get().attr("height", height_);
-        return get();
+        return self().attr("height", height_);
     }
 
     default T withCondHeight(final boolean enable, final String height_) {
         if (enable) {
-            get().attr("height", height_);
+            self().attr("height", height_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IHigh.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IHigh<T extends Tag> extends IInstance<T> {
+public interface IHigh<T extends Tag<T>> extends IInstance<T> {
     default T withHigh(final String high_) {
-        get().attr("high", high_);
-        return get();
+        return self().attr("high", high_);
     }
 
     default T withCondHigh(final boolean enable, final String high_) {
         if (enable) {
-            get().attr("high", high_);
+            self().attr("high", high_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IHref.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IHref<T extends Tag> extends IInstance<T> {
+public interface IHref<T extends Tag<T>> extends IInstance<T> {
     default T withHref(final String href_) {
-        get().attr("href", href_);
-        return get();
+        return self().attr("href", href_);
     }
 
     default T withCondHref(final boolean enable, final String href_) {
         if (enable) {
-            get().attr("href", href_);
+            self().attr("href", href_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IHreflang.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IHreflang<T extends Tag> extends IInstance<T> {
+public interface IHreflang<T extends Tag<T>> extends IInstance<T> {
     default T withHreflang(final String hreflang_) {
-        get().attr("hreflang", hreflang_);
-        return get();
+        return self().attr("hreflang", hreflang_);
     }
 
     default T withCondHreflang(final boolean enable, final String hreflang_) {
         if (enable) {
-            get().attr("hreflang", hreflang_);
+            self().attr("hreflang", hreflang_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IIsmap.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IIsmap<T extends Tag> extends IInstance<T> {
+public interface IIsmap<T extends Tag<T>> extends IInstance<T> {
     default T isIsmap() {
-        get().attr("ismap");
-        return get();
+        self().attr("ismap");
+        return self();
     }
 
     default T withCondIsmap(final boolean enable) {
         if (enable) {
-            get().attr("ismap");
+            self().attr("ismap");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IKind.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IKind<T extends Tag> extends IInstance<T> {
+public interface IKind<T extends Tag<T>> extends IInstance<T> {
     default T withKind(final String kind_) {
-        get().attr("kind", kind_);
-        return get();
+        return self().attr("kind", kind_);
     }
 
     default T withCondKind(final boolean enable, final String kind_) {
         if (enable) {
-            get().attr("kind", kind_);
+            self().attr("kind", kind_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/ILabel.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface ILabel<T extends Tag> extends IInstance<T> {
+public interface ILabel<T extends Tag<T>> extends IInstance<T> {
     default T withLabel(final String label_) {
-        get().attr("label", label_);
-        return get();
+        return self().attr("label", label_);
     }
 
     default T withCondLabel(final boolean enable, final String label_) {
         if (enable) {
-            get().attr("label", label_);
+            self().attr("label", label_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IList.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IList<T extends Tag> extends IInstance<T> {
+public interface IList<T extends Tag<T>> extends IInstance<T> {
     default T withList(final String list_) {
-        get().attr("list", list_);
-        return get();
+        return self().attr("list", list_);
     }
 
     default T withCondList(final boolean enable, final String list_) {
         if (enable) {
-            get().attr("list", list_);
+            self().attr("list", list_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/ILoop.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface ILoop<T extends Tag> extends IInstance<T> {
+public interface ILoop<T extends Tag<T>> extends IInstance<T> {
     default T isLoop() {
-        get().attr("loop");
-        return get();
+        self().attr("loop");
+        return self();
     }
 
     default T withCondLoop(final boolean enable) {
         if (enable) {
-            get().attr("loop");
+            self().attr("loop");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/ILow.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface ILow<T extends Tag> extends IInstance<T> {
+public interface ILow<T extends Tag<T>> extends IInstance<T> {
     default T withLow(final String low_) {
-        get().attr("low", low_);
-        return get();
+        return self().attr("low", low_);
     }
 
     default T withCondLow(final boolean enable, final String low_) {
         if (enable) {
-            get().attr("low", low_);
+            self().attr("low", low_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IMax.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IMax<T extends Tag> extends IInstance<T> {
+public interface IMax<T extends Tag<T>> extends IInstance<T> {
     default T withMax(final String max_) {
-        get().attr("max", max_);
-        return get();
+        return self().attr("max", max_);
     }
 
     default T withCondMax(final boolean enable, final String max_) {
         if (enable) {
-            get().attr("max", max_);
+            self().attr("max", max_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IMaxlength.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IMaxlength<T extends Tag> extends IInstance<T> {
+public interface IMaxlength<T extends Tag<T>> extends IInstance<T> {
     default T withMaxlength(final String maxlength_) {
-        get().attr("maxlength", maxlength_);
-        return get();
+        return self().attr("maxlength", maxlength_);
     }
 
     default T withCondMaxlength(final boolean enable, final String maxlength_) {
         if (enable) {
-            get().attr("maxlength", maxlength_);
+            self().attr("maxlength", maxlength_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IMedia.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IMedia<T extends Tag> extends IInstance<T> {
+public interface IMedia<T extends Tag<T>> extends IInstance<T> {
     default T withMedia(final String media_) {
-        get().attr("media", media_);
-        return get();
+        return self().attr("media", media_);
     }
 
     default T withCondMedia(final boolean enable, final String media_) {
         if (enable) {
-            get().attr("media", media_);
+            self().attr("media", media_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IMethod.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IMethod<T extends Tag> extends IInstance<T> {
+public interface IMethod<T extends Tag<T>> extends IInstance<T> {
     default T withMethod(final String method_) {
-        get().attr("method", method_);
-        return get();
+        return self().attr("method", method_);
     }
 
     default T withCondMethod(final boolean enable, final String method_) {
         if (enable) {
-            get().attr("method", method_);
+            self().attr("method", method_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IMin.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IMin<T extends Tag> extends IInstance<T> {
+public interface IMin<T extends Tag<T>> extends IInstance<T> {
     default T withMin(final String min_) {
-        get().attr("min", min_);
-        return get();
+        return self().attr("min", min_);
     }
 
     default T withCondMin(final boolean enable, final String min_) {
         if (enable) {
-            get().attr("min", min_);
+            self().attr("min", min_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IMultiple.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IMultiple<T extends Tag> extends IInstance<T> {
+public interface IMultiple<T extends Tag<T>> extends IInstance<T> {
     default T isMultiple() {
-        get().attr("multiple");
-        return get();
+        self().attr("multiple");
+        return self();
     }
 
     default T withCondMultiple(final boolean enable) {
         if (enable) {
-            get().attr("multiple");
+            self().attr("multiple");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IMuted.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IMuted<T extends Tag> extends IInstance<T> {
+public interface IMuted<T extends Tag<T>> extends IInstance<T> {
     default T isMuted() {
-        get().attr("muted");
-        return get();
+        self().attr("muted");
+        return self();
     }
 
     default T withCondMuted(final boolean enable) {
         if (enable) {
-            get().attr("muted");
+            self().attr("muted");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IName.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IName<T extends Tag> extends IInstance<T> {
+public interface IName<T extends Tag<T>> extends IInstance<T> {
     default T withName(final String name_) {
-        get().attr("name", name_);
-        return get();
+        return self().attr("name", name_);
     }
 
     default T withCondName(final boolean enable, final String name_) {
         if (enable) {
-            get().attr("name", name_);
+            self().attr("name", name_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/INovalidate.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface INovalidate<T extends Tag> extends IInstance<T> {
+public interface INovalidate<T extends Tag<T>> extends IInstance<T> {
     default T isNovalidate() {
-        get().attr("novalidate");
-        return get();
+        self().attr("novalidate");
+        return self();
     }
 
     default T withCondNovalidate(final boolean enable) {
         if (enable) {
-            get().attr("novalidate");
+            self().attr("novalidate");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnabort.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnabort<T extends Tag> extends IInstance<T> {
+public interface IOnabort<T extends Tag<T>> extends IInstance<T> {
     default T withOnabort(final String onabort_) {
-        get().attr("onabort", onabort_);
-        return get();
+        return self().attr("onabort", onabort_);
     }
 
     default T withCondOnabort(final boolean enable, final String onabort_) {
         if (enable) {
-            get().attr("onabort", onabort_);
+            self().attr("onabort", onabort_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnafterprint.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnafterprint<T extends Tag> extends IInstance<T> {
+public interface IOnafterprint<T extends Tag<T>> extends IInstance<T> {
     default T withOnafterprint(final String onafterprint_) {
-        get().attr("onafterprint", onafterprint_);
-        return get();
+        return self().attr("onafterprint", onafterprint_);
     }
 
     default T withCondOnafterprint(final boolean enable, final String onafterprint_) {
         if (enable) {
-            get().attr("onafterprint", onafterprint_);
+            self().attr("onafterprint", onafterprint_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnbeforeprint.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnbeforeprint<T extends Tag> extends IInstance<T> {
+public interface IOnbeforeprint<T extends Tag<T>> extends IInstance<T> {
     default T withOnbeforeprint(final String onbeforeprint_) {
-        get().attr("onbeforeprint", onbeforeprint_);
-        return get();
+        return self().attr("onbeforeprint", onbeforeprint_);
     }
 
     default T withCondOnbeforeprint(final boolean enable, final String onbeforeprint_) {
         if (enable) {
-            get().attr("onbeforeprint", onbeforeprint_);
+            self().attr("onbeforeprint", onbeforeprint_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnbeforeunload.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnbeforeunload<T extends Tag> extends IInstance<T> {
+public interface IOnbeforeunload<T extends Tag<T>> extends IInstance<T> {
     default T withOnbeforeunload(final String onbeforeunload_) {
-        get().attr("onbeforeunload", onbeforeunload_);
-        return get();
+        return self().attr("onbeforeunload", onbeforeunload_);
     }
 
     default T withCondOnbeforeunload(final boolean enable, final String onbeforeunload_) {
         if (enable) {
-            get().attr("onbeforeunload", onbeforeunload_);
+            self().attr("onbeforeunload", onbeforeunload_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOncanplay.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOncanplay<T extends Tag> extends IInstance<T> {
+public interface IOncanplay<T extends Tag<T>> extends IInstance<T> {
     default T withOncanplay(final String oncanplay_) {
-        get().attr("oncanplay", oncanplay_);
-        return get();
+        return self().attr("oncanplay", oncanplay_);
     }
 
     default T withCondOncanplay(final boolean enable, final String oncanplay_) {
         if (enable) {
-            get().attr("oncanplay", oncanplay_);
+            self().attr("oncanplay", oncanplay_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOncanplaythrough.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOncanplaythrough<T extends Tag> extends IInstance<T> {
+public interface IOncanplaythrough<T extends Tag<T>> extends IInstance<T> {
     default T withOncanplaythrough(final String oncanplaythrough_) {
-        get().attr("oncanplaythrough", oncanplaythrough_);
-        return get();
+        return self().attr("oncanplaythrough", oncanplaythrough_);
     }
 
     default T withCondOncanplaythrough(final boolean enable, final String oncanplaythrough_) {
         if (enable) {
-            get().attr("oncanplaythrough", oncanplaythrough_);
+            self().attr("oncanplaythrough", oncanplaythrough_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOncuechange.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOncuechange<T extends Tag> extends IInstance<T> {
+public interface IOncuechange<T extends Tag<T>> extends IInstance<T> {
     default T withOncuechange(final String oncuechange_) {
-        get().attr("oncuechange", oncuechange_);
-        return get();
+        return self().attr("oncuechange", oncuechange_);
     }
 
     default T withCondOncuechange(final boolean enable, final String oncuechange_) {
         if (enable) {
-            get().attr("oncuechange", oncuechange_);
+            self().attr("oncuechange", oncuechange_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOndurationchange.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOndurationchange<T extends Tag> extends IInstance<T> {
+public interface IOndurationchange<T extends Tag<T>> extends IInstance<T> {
     default T withOndurationchange(final String ondurationchange_) {
-        get().attr("ondurationchange", ondurationchange_);
-        return get();
+        return self().attr("ondurationchange", ondurationchange_);
     }
 
     default T withCondOndurationchange(final boolean enable, final String ondurationchange_) {
         if (enable) {
-            get().attr("ondurationchange", ondurationchange_);
+            self().attr("ondurationchange", ondurationchange_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnemptied.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnemptied<T extends Tag> extends IInstance<T> {
+public interface IOnemptied<T extends Tag<T>> extends IInstance<T> {
     default T withOnemptied(final String onemptied_) {
-        get().attr("onemptied", onemptied_);
-        return get();
+        return self().attr("onemptied", onemptied_);
     }
 
     default T withCondOnemptied(final boolean enable, final String onemptied_) {
         if (enable) {
-            get().attr("onemptied", onemptied_);
+            self().attr("onemptied", onemptied_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnended.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnended<T extends Tag> extends IInstance<T> {
+public interface IOnended<T extends Tag<T>> extends IInstance<T> {
     default T withOnended(final String onended_) {
-        get().attr("onended", onended_);
-        return get();
+        return self().attr("onended", onended_);
     }
 
     default T withCondOnended(final boolean enable, final String onended_) {
         if (enable) {
-            get().attr("onended", onended_);
+            self().attr("onended", onended_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnerror.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnerror<T extends Tag> extends IInstance<T> {
+public interface IOnerror<T extends Tag<T>> extends IInstance<T> {
     default T withOnerror(final String onerror_) {
-        get().attr("onerror", onerror_);
-        return get();
+        return self().attr("onerror", onerror_);
     }
 
     default T withCondOnerror(final boolean enable, final String onerror_) {
         if (enable) {
-            get().attr("onerror", onerror_);
+            self().attr("onerror", onerror_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnhashchange.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnhashchange<T extends Tag> extends IInstance<T> {
+public interface IOnhashchange<T extends Tag<T>> extends IInstance<T> {
     default T withOnhashchange(final String onhashchange_) {
-        get().attr("onhashchange", onhashchange_);
-        return get();
+        return self().attr("onhashchange", onhashchange_);
     }
 
     default T withCondOnhashchange(final boolean enable, final String onhashchange_) {
         if (enable) {
-            get().attr("onhashchange", onhashchange_);
+            self().attr("onhashchange", onhashchange_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnload.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnload<T extends Tag> extends IInstance<T> {
+public interface IOnload<T extends Tag<T>> extends IInstance<T> {
     default T withOnload(final String onload_) {
-        get().attr("onload", onload_);
-        return get();
+        return self().attr("onload", onload_);
     }
 
     default T withCondOnload(final boolean enable, final String onload_) {
         if (enable) {
-            get().attr("onload", onload_);
+            self().attr("onload", onload_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnloadeddata.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnloadeddata<T extends Tag> extends IInstance<T> {
+public interface IOnloadeddata<T extends Tag<T>> extends IInstance<T> {
     default T withOnloadeddata(final String onloadeddata_) {
-        get().attr("onloadeddata", onloadeddata_);
-        return get();
+        return self().attr("onloadeddata", onloadeddata_);
     }
 
     default T withCondOnloadeddata(final boolean enable, final String onloadeddata_) {
         if (enable) {
-            get().attr("onloadeddata", onloadeddata_);
+            self().attr("onloadeddata", onloadeddata_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnloadedmetadata.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnloadedmetadata<T extends Tag> extends IInstance<T> {
+public interface IOnloadedmetadata<T extends Tag<T>> extends IInstance<T> {
     default T withOnloadedmetadata(final String onloadedmetadata_) {
-        get().attr("onloadedmetadata", onloadedmetadata_);
-        return get();
+        return self().attr("onloadedmetadata", onloadedmetadata_);
     }
 
     default T withCondOnloadedmetadata(final boolean enable, final String onloadedmetadata_) {
         if (enable) {
-            get().attr("onloadedmetadata", onloadedmetadata_);
+            self().attr("onloadedmetadata", onloadedmetadata_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnloadstart.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnloadstart<T extends Tag> extends IInstance<T> {
+public interface IOnloadstart<T extends Tag<T>> extends IInstance<T> {
     default T withOnloadstart(final String onloadstart_) {
-        get().attr("onloadstart", onloadstart_);
-        return get();
+        return self().attr("onloadstart", onloadstart_);
     }
 
     default T withCondOnloadstart(final boolean enable, final String onloadstart_) {
         if (enable) {
-            get().attr("onloadstart", onloadstart_);
+            self().attr("onloadstart", onloadstart_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnoffline.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnoffline<T extends Tag> extends IInstance<T> {
+public interface IOnoffline<T extends Tag<T>> extends IInstance<T> {
     default T withOnoffline(final String onoffline_) {
-        get().attr("onoffline", onoffline_);
-        return get();
+        return self().attr("onoffline", onoffline_);
     }
 
     default T withCondOnoffline(final boolean enable, final String onoffline_) {
         if (enable) {
-            get().attr("onoffline", onoffline_);
+            self().attr("onoffline", onoffline_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnonline.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnonline<T extends Tag> extends IInstance<T> {
+public interface IOnonline<T extends Tag<T>> extends IInstance<T> {
     default T withOnonline(final String ononline_) {
-        get().attr("ononline", ononline_);
-        return get();
+        return self().attr("ononline", ononline_);
     }
 
     default T withCondOnonline(final boolean enable, final String ononline_) {
         if (enable) {
-            get().attr("ononline", ononline_);
+            self().attr("ononline", ononline_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnpagehide.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnpagehide<T extends Tag> extends IInstance<T> {
+public interface IOnpagehide<T extends Tag<T>> extends IInstance<T> {
     default T withOnpagehide(final String onpagehide_) {
-        get().attr("onpagehide", onpagehide_);
-        return get();
+        return self().attr("onpagehide", onpagehide_);
     }
 
     default T withCondOnpagehide(final boolean enable, final String onpagehide_) {
         if (enable) {
-            get().attr("onpagehide", onpagehide_);
+            self().attr("onpagehide", onpagehide_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnpageshow.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnpageshow<T extends Tag> extends IInstance<T> {
+public interface IOnpageshow<T extends Tag<T>> extends IInstance<T> {
     default T withOnpageshow(final String onpageshow_) {
-        get().attr("onpageshow", onpageshow_);
-        return get();
+        return self().attr("onpageshow", onpageshow_);
     }
 
     default T withCondOnpageshow(final boolean enable, final String onpageshow_) {
         if (enable) {
-            get().attr("onpageshow", onpageshow_);
+            self().attr("onpageshow", onpageshow_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnpause.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnpause<T extends Tag> extends IInstance<T> {
+public interface IOnpause<T extends Tag<T>> extends IInstance<T> {
     default T withOnpause(final String onpause_) {
-        get().attr("onpause", onpause_);
-        return get();
+        return self().attr("onpause", onpause_);
     }
 
     default T withCondOnpause(final boolean enable, final String onpause_) {
         if (enable) {
-            get().attr("onpause", onpause_);
+            self().attr("onpause", onpause_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnplay.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnplay<T extends Tag> extends IInstance<T> {
+public interface IOnplay<T extends Tag<T>> extends IInstance<T> {
     default T withOnplay(final String onplay_) {
-        get().attr("onplay", onplay_);
-        return get();
+        return self().attr("onplay", onplay_);
     }
 
     default T withCondOnplay(final boolean enable, final String onplay_) {
         if (enable) {
-            get().attr("onplay", onplay_);
+            self().attr("onplay", onplay_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnplaying.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnplaying<T extends Tag> extends IInstance<T> {
+public interface IOnplaying<T extends Tag<T>> extends IInstance<T> {
     default T withOnplaying(final String onplaying_) {
-        get().attr("onplaying", onplaying_);
-        return get();
+        return self().attr("onplaying", onplaying_);
     }
 
     default T withCondOnplaying(final boolean enable, final String onplaying_) {
         if (enable) {
-            get().attr("onplaying", onplaying_);
+            self().attr("onplaying", onplaying_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnpopstate.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnpopstate<T extends Tag> extends IInstance<T> {
+public interface IOnpopstate<T extends Tag<T>> extends IInstance<T> {
     default T withOnpopstate(final String onpopstate_) {
-        get().attr("onpopstate", onpopstate_);
-        return get();
+        return self().attr("onpopstate", onpopstate_);
     }
 
     default T withCondOnpopstate(final boolean enable, final String onpopstate_) {
         if (enable) {
-            get().attr("onpopstate", onpopstate_);
+            self().attr("onpopstate", onpopstate_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnprogress.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnprogress<T extends Tag> extends IInstance<T> {
+public interface IOnprogress<T extends Tag<T>> extends IInstance<T> {
     default T withOnprogress(final String onprogress_) {
-        get().attr("onprogress", onprogress_);
-        return get();
+        return self().attr("onprogress", onprogress_);
     }
 
     default T withCondOnprogress(final boolean enable, final String onprogress_) {
         if (enable) {
-            get().attr("onprogress", onprogress_);
+            self().attr("onprogress", onprogress_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnratechange.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnratechange<T extends Tag> extends IInstance<T> {
+public interface IOnratechange<T extends Tag<T>> extends IInstance<T> {
     default T withOnratechange(final String onratechange_) {
-        get().attr("onratechange", onratechange_);
-        return get();
+        return self().attr("onratechange", onratechange_);
     }
 
     default T withCondOnratechange(final boolean enable, final String onratechange_) {
         if (enable) {
-            get().attr("onratechange", onratechange_);
+            self().attr("onratechange", onratechange_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnreset.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnreset<T extends Tag> extends IInstance<T> {
+public interface IOnreset<T extends Tag<T>> extends IInstance<T> {
     default T withOnreset(final String onreset_) {
-        get().attr("onreset", onreset_);
-        return get();
+        return self().attr("onreset", onreset_);
     }
 
     default T withCondOnreset(final boolean enable, final String onreset_) {
         if (enable) {
-            get().attr("onreset", onreset_);
+            self().attr("onreset", onreset_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnresize.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnresize<T extends Tag> extends IInstance<T> {
+public interface IOnresize<T extends Tag<T>> extends IInstance<T> {
     default T withOnresize(final String onresize_) {
-        get().attr("onresize", onresize_);
-        return get();
+        return self().attr("onresize", onresize_);
     }
 
     default T withCondOnresize(final boolean enable, final String onresize_) {
         if (enable) {
-            get().attr("onresize", onresize_);
+            self().attr("onresize", onresize_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnsearch.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnsearch<T extends Tag> extends IInstance<T> {
+public interface IOnsearch<T extends Tag<T>> extends IInstance<T> {
     default T withOnsearch(final String onsearch_) {
-        get().attr("onsearch", onsearch_);
-        return get();
+        return self().attr("onsearch", onsearch_);
     }
 
     default T withCondOnsearch(final boolean enable, final String onsearch_) {
         if (enable) {
-            get().attr("onsearch", onsearch_);
+            self().attr("onsearch", onsearch_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnseeked.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnseeked<T extends Tag> extends IInstance<T> {
+public interface IOnseeked<T extends Tag<T>> extends IInstance<T> {
     default T withOnseeked(final String onseeked_) {
-        get().attr("onseeked", onseeked_);
-        return get();
+        return self().attr("onseeked", onseeked_);
     }
 
     default T withCondOnseeked(final boolean enable, final String onseeked_) {
         if (enable) {
-            get().attr("onseeked", onseeked_);
+            self().attr("onseeked", onseeked_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnseeking.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnseeking<T extends Tag> extends IInstance<T> {
+public interface IOnseeking<T extends Tag<T>> extends IInstance<T> {
     default T withOnseeking(final String onseeking_) {
-        get().attr("onseeking", onseeking_);
-        return get();
+        return self().attr("onseeking", onseeking_);
     }
 
     default T withCondOnseeking(final boolean enable, final String onseeking_) {
         if (enable) {
-            get().attr("onseeking", onseeking_);
+            self().attr("onseeking", onseeking_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnstalled.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnstalled<T extends Tag> extends IInstance<T> {
+public interface IOnstalled<T extends Tag<T>> extends IInstance<T> {
     default T withOnstalled(final String onstalled_) {
-        get().attr("onstalled", onstalled_);
-        return get();
+        return self().attr("onstalled", onstalled_);
     }
 
     default T withCondOnstalled(final boolean enable, final String onstalled_) {
         if (enable) {
-            get().attr("onstalled", onstalled_);
+            self().attr("onstalled", onstalled_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnstorage.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnstorage<T extends Tag> extends IInstance<T> {
+public interface IOnstorage<T extends Tag<T>> extends IInstance<T> {
     default T withOnstorage(final String onstorage_) {
-        get().attr("onstorage", onstorage_);
-        return get();
+        return self().attr("onstorage", onstorage_);
     }
 
     default T withCondOnstorage(final boolean enable, final String onstorage_) {
         if (enable) {
-            get().attr("onstorage", onstorage_);
+            self().attr("onstorage", onstorage_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnsubmit.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnsubmit<T extends Tag> extends IInstance<T> {
+public interface IOnsubmit<T extends Tag<T>> extends IInstance<T> {
     default T withOnsubmit(final String onsubmit_) {
-        get().attr("onsubmit", onsubmit_);
-        return get();
+        return self().attr("onsubmit", onsubmit_);
     }
 
     default T withCondOnsubmit(final boolean enable, final String onsubmit_) {
         if (enable) {
-            get().attr("onsubmit", onsubmit_);
+            self().attr("onsubmit", onsubmit_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnsuspend.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnsuspend<T extends Tag> extends IInstance<T> {
+public interface IOnsuspend<T extends Tag<T>> extends IInstance<T> {
     default T withOnsuspend(final String onsuspend_) {
-        get().attr("onsuspend", onsuspend_);
-        return get();
+        return self().attr("onsuspend", onsuspend_);
     }
 
     default T withCondOnsuspend(final boolean enable, final String onsuspend_) {
         if (enable) {
-            get().attr("onsuspend", onsuspend_);
+            self().attr("onsuspend", onsuspend_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOntimeupdate.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOntimeupdate<T extends Tag> extends IInstance<T> {
+public interface IOntimeupdate<T extends Tag<T>> extends IInstance<T> {
     default T withOntimeupdate(final String ontimeupdate_) {
-        get().attr("ontimeupdate", ontimeupdate_);
-        return get();
+        return self().attr("ontimeupdate", ontimeupdate_);
     }
 
     default T withCondOntimeupdate(final boolean enable, final String ontimeupdate_) {
         if (enable) {
-            get().attr("ontimeupdate", ontimeupdate_);
+            self().attr("ontimeupdate", ontimeupdate_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOntoggle.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOntoggle<T extends Tag> extends IInstance<T> {
+public interface IOntoggle<T extends Tag<T>> extends IInstance<T> {
     default T withOntoggle(final String ontoggle_) {
-        get().attr("ontoggle", ontoggle_);
-        return get();
+        return self().attr("ontoggle", ontoggle_);
     }
 
     default T withCondOntoggle(final boolean enable, final String ontoggle_) {
         if (enable) {
-            get().attr("ontoggle", ontoggle_);
+            self().attr("ontoggle", ontoggle_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnunload.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnunload<T extends Tag> extends IInstance<T> {
+public interface IOnunload<T extends Tag<T>> extends IInstance<T> {
     default T withOnunload(final String onunload_) {
-        get().attr("onunload", onunload_);
-        return get();
+        return self().attr("onunload", onunload_);
     }
 
     default T withCondOnunload(final boolean enable, final String onunload_) {
         if (enable) {
-            get().attr("onunload", onunload_);
+            self().attr("onunload", onunload_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnvolumechanged.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnvolumechanged<T extends Tag> extends IInstance<T> {
+public interface IOnvolumechanged<T extends Tag<T>> extends IInstance<T> {
     default T withOnvolumechanged(final String onvolumechanged_) {
-        get().attr("onvolumechanged", onvolumechanged_);
-        return get();
+        return self().attr("onvolumechanged", onvolumechanged_);
     }
 
     default T withCondOnvolumechanged(final boolean enable, final String onvolumechanged_) {
         if (enable) {
-            get().attr("onvolumechanged", onvolumechanged_);
+            self().attr("onvolumechanged", onvolumechanged_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOnwaiting.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOnwaiting<T extends Tag> extends IInstance<T> {
+public interface IOnwaiting<T extends Tag<T>> extends IInstance<T> {
     default T withOnwaiting(final String onwaiting_) {
-        get().attr("onwaiting", onwaiting_);
-        return get();
+        return self().attr("onwaiting", onwaiting_);
     }
 
     default T withCondOnwaiting(final boolean enable, final String onwaiting_) {
         if (enable) {
-            get().attr("onwaiting", onwaiting_);
+            self().attr("onwaiting", onwaiting_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOpen.java

@@ -3,16 +3,16 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOpen<T extends Tag> extends IInstance<T> {
+public interface IOpen<T extends Tag<T>> extends IInstance<T> {
     default T isOpen() {
-        get().attr("open");
-        return get();
+        self().attr("open");
+        return self();
     }
 
     default T withCondOpen(final boolean enable) {
         if (enable) {
-            get().attr("open");
+            self().attr("open");
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IOptimum.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IOptimum<T extends Tag> extends IInstance<T> {
+public interface IOptimum<T extends Tag<T>> extends IInstance<T> {
     default T withOptimum(final String optimum_) {
-        get().attr("optimum", optimum_);
-        return get();
+        return self().attr("optimum", optimum_);
     }
 
     default T withCondOptimum(final boolean enable, final String optimum_) {
         if (enable) {
-            get().attr("optimum", optimum_);
+            self().attr("optimum", optimum_);
         }
-        return get();
+        return self();
     }
 }

library/src/main/java/j2html/tags/attributes/IPattern.java

@@ -3,16 +3,15 @@ package j2html.tags.attributes;
 import j2html.tags.IInstance;
 import j2html.tags.Tag;
 
-public interface IPattern<T extends Tag> extends IInstance<T> {
+public interface IPattern<T extends Tag<T>> extends IInstance<T> {
     default T withPattern(final String pattern_) {
-        get().attr("pattern", pattern_);
-        return get();
+        return self().attr("pattern", pattern_);
     }
 
     default T withCondPattern(final boolean enable, final String pattern_) {
         if (enable) {
-            get().attr("pattern", pattern_);
+            self().attr("pattern", pattern_);
         }
-        return get();
+        return self();
     }
 }