From 949448d305c08aaa861a221f4c4d210f0c2116f8 Mon Sep 17 00:00:00 2001
From: Eli Hart <eli.hart@airbnb.com>
Date: Wed, 6 May 2020 14:28:34 -0500
Subject: [PATCH 1/5] fix result name clash

---
 .../com/airbnb/epoxy/GeneratedModelWriter.kt  |  26 ++-
 reports/profile/css/base-style.css            | 179 ++++++++++++++++
 reports/profile/css/style.css                 |   4 +
 reports/profile/js/report.js                  | 194 ++++++++++++++++++
 .../profile/profile-2020-03-31-14-39-05.html  | 165 +++++++++++++++
 5 files changed, 558 insertions(+), 10 deletions(-)
 create mode 100644 reports/profile/css/base-style.css
 create mode 100644 reports/profile/css/style.css
 create mode 100644 reports/profile/js/report.js
 create mode 100644 reports/profile/profile-2020-03-31-14-39-05.html

diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelWriter.kt b/epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelWriter.kt
index 77a6f693fd..0d5fbf9c3f 100644
--- a/epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelWriter.kt
+++ b/epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelWriter.kt
@@ -1493,7 +1493,7 @@ internal class GeneratedModelWriter(
         addAnnotation(Override::class.java)
         addModifiers(PUBLIC)
         returns(TypeName.INT)
-        addStatement("int result = super.hashCode()")
+        addStatement("int $HASH_CODE_RESULT_PROPERTY = super.hashCode()")
 
         addHashCodeLineForType(
             this,
@@ -1546,7 +1546,7 @@ internal class GeneratedModelWriter(
             )
         }
 
-        addStatement("return result")
+        addStatement("return $HASH_CODE_RESULT_PROPERTY")
     }
 
     private fun generateToString(helperClass: GeneratedModelInfo) = buildMethod("toString") {
@@ -1991,38 +1991,38 @@ internal class GeneratedModelWriter(
                 if (useObjectHashCode) {
                     when (type) {
                         BYTE, CHAR, SHORT, INT -> addStatement(
-                            "result = 31 * result + \$L",
+                            "$HASH_CODE_RESULT_PROPERTY = 31 * $HASH_CODE_RESULT_PROPERTY + \$L",
                             accessorCode
                         )
                         LONG -> addStatement(
-                            "result = 31 * result + (int) (\$L ^ (\$L >>> 32))",
+                            "$HASH_CODE_RESULT_PROPERTY = 31 * $HASH_CODE_RESULT_PROPERTY + (int) (\$L ^ (\$L >>> 32))",
                             accessorCode,
                             accessorCode
                         )
                         FLOAT -> addStatement(
-                            "result = 31 * result + (\$L != +0.0f " + "? " +
+                            "$HASH_CODE_RESULT_PROPERTY = 31 * $HASH_CODE_RESULT_PROPERTY + (\$L != +0.0f " + "? " +
                                 "Float.floatToIntBits(\$L) : 0)",
                             accessorCode, accessorCode
                         )
                         DOUBLE -> {
                             addStatement("temp = Double.doubleToLongBits(\$L)", accessorCode)
-                            addStatement("result = 31 * result + (int) (temp ^ (temp >>> 32))")
+                            addStatement("$HASH_CODE_RESULT_PROPERTY = 31 * $HASH_CODE_RESULT_PROPERTY + (int) (temp ^ (temp >>> 32))")
                         }
                         BOOLEAN -> addStatement(
-                            "result = 31 * result + (\$L ? 1 : 0)",
+                            "$HASH_CODE_RESULT_PROPERTY = 31 * $HASH_CODE_RESULT_PROPERTY + (\$L ? 1 : 0)",
                             accessorCode
                         )
                         is ArrayTypeName -> addStatement(
-                            "result = 31 * result + Arrays.hashCode(\$L)", accessorCode
+                            "$HASH_CODE_RESULT_PROPERTY = 31 * $HASH_CODE_RESULT_PROPERTY + Arrays.hashCode(\$L)", accessorCode
                         )
                         else -> addStatement(
-                            "result = 31 * result + (\$L != null ? \$L.hashCode() : 0)",
+                            "$HASH_CODE_RESULT_PROPERTY = 31 * $HASH_CODE_RESULT_PROPERTY + (\$L != null ? \$L.hashCode() : 0)",
                             accessorCode,
                             accessorCode
                         )
                     }
                 } else {
-                    addStatement("result = 31 * result + (\$L != null ? 1 : 0)", accessorCode)
+                    addStatement("$HASH_CODE_RESULT_PROPERTY = 31 * $HASH_CODE_RESULT_PROPERTY + (\$L != null ? 1 : 0)", accessorCode)
                 }
             }
         }
@@ -2052,3 +2052,9 @@ internal class GeneratedModelWriter(
         }
     }
 }
+
+/**
+ * Property name of the int property used to build the hashcode result.
+ * An underscore is used to not clash with any attribute names a user might choose.
+ */
+private const val HASH_CODE_RESULT_PROPERTY = "_result"
diff --git a/reports/profile/css/base-style.css b/reports/profile/css/base-style.css
new file mode 100644
index 0000000000..4afa73e3dd
--- /dev/null
+++ b/reports/profile/css/base-style.css
@@ -0,0 +1,179 @@
+
+body {
+    margin: 0;
+    padding: 0;
+    font-family: sans-serif;
+    font-size: 12pt;
+}
+
+body, a, a:visited {
+    color: #303030;
+}
+
+#content {
+    padding-left: 50px;
+    padding-right: 50px;
+    padding-top: 30px;
+    padding-bottom: 30px;
+}
+
+#content h1 {
+    font-size: 160%;
+    margin-bottom: 10px;
+}
+
+#footer {
+    margin-top: 100px;
+    font-size: 80%;
+    white-space: nowrap;
+}
+
+#footer, #footer a {
+    color: #a0a0a0;
+}
+
+#line-wrapping-toggle {
+    vertical-align: middle;
+}
+
+#label-for-line-wrapping-toggle {
+    vertical-align: middle;
+}
+
+ul {
+    margin-left: 0;
+}
+
+h1, h2, h3 {
+    white-space: nowrap;
+}
+
+h2 {
+    font-size: 120%;
+}
+
+ul.tabLinks {
+    padding-left: 0;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    overflow: auto;
+    min-width: 800px;
+    width: auto !important;
+    width: 800px;
+}
+
+ul.tabLinks li {
+    float: left;
+    height: 100%;
+    list-style: none;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    margin-bottom: 0;
+    -moz-border-radius: 7px;
+    border-radius: 7px;
+    margin-right: 25px;
+    border: solid 1px #d4d4d4;
+    background-color: #f0f0f0;
+}
+
+ul.tabLinks li:hover {
+    background-color: #fafafa;
+}
+
+ul.tabLinks li.selected {
+    background-color: #c5f0f5;
+    border-color: #c5f0f5;
+}
+
+ul.tabLinks a {
+    font-size: 120%;
+    display: block;
+    outline: none;
+    text-decoration: none;
+    margin: 0;
+    padding: 0;
+}
+
+ul.tabLinks li h2 {
+    margin: 0;
+    padding: 0;
+}
+
+div.tab {
+}
+
+div.selected {
+    display: block;
+}
+
+div.deselected {
+    display: none;
+}
+
+div.tab table {
+    min-width: 350px;
+    width: auto !important;
+    width: 350px;
+    border-collapse: collapse;
+}
+
+div.tab th, div.tab table {
+    border-bottom: solid #d0d0d0 1px;
+}
+
+div.tab th {
+    text-align: left;
+    white-space: nowrap;
+    padding-left: 6em;
+}
+
+div.tab th:first-child {
+    padding-left: 0;
+}
+
+div.tab td {
+    white-space: nowrap;
+    padding-left: 6em;
+    padding-top: 5px;
+    padding-bottom: 5px;
+}
+
+div.tab td:first-child {
+    padding-left: 0;
+}
+
+div.tab td.numeric, div.tab th.numeric {
+    text-align: right;
+}
+
+span.code {
+    display: inline-block;
+    margin-top: 0em;
+    margin-bottom: 1em;
+}
+
+span.code pre {
+    font-size: 11pt;
+    padding-top: 10px;
+    padding-bottom: 10px;
+    padding-left: 10px;
+    padding-right: 10px;
+    margin: 0;
+    background-color: #f7f7f7;
+    border: solid 1px #d0d0d0;
+    min-width: 700px;
+    width: auto !important;
+    width: 700px;
+}
+
+span.wrapped pre {
+    word-wrap: break-word;
+    white-space: pre-wrap;
+    word-break: break-all;
+}
+
+label.hidden {
+    display: none;
+}
\ No newline at end of file
diff --git a/reports/profile/css/style.css b/reports/profile/css/style.css
new file mode 100644
index 0000000000..c4a4239337
--- /dev/null
+++ b/reports/profile/css/style.css
@@ -0,0 +1,4 @@
+
+div.tab td.indentPath {
+    padding-left: 3em;
+}
diff --git a/reports/profile/js/report.js b/reports/profile/js/report.js
new file mode 100644
index 0000000000..83bab4a19f
--- /dev/null
+++ b/reports/profile/js/report.js
@@ -0,0 +1,194 @@
+(function (window, document) {
+    "use strict";
+
+    var tabs = {};
+
+    function changeElementClass(element, classValue) {
+        if (element.getAttribute("className")) {
+            element.setAttribute("className", classValue);
+        } else {
+            element.setAttribute("class", classValue);
+        }
+    }
+
+    function getClassAttribute(element) {
+        if (element.getAttribute("className")) {
+            return element.getAttribute("className");
+        } else {
+            return element.getAttribute("class");
+        }
+    }
+
+    function addClass(element, classValue) {
+        changeElementClass(element, getClassAttribute(element) + " " + classValue);
+    }
+
+    function removeClass(element, classValue) {
+        changeElementClass(element, getClassAttribute(element).replace(classValue, ""));
+    }
+
+    function initTabs() {
+        var container = document.getElementById("tabs");
+
+        tabs.tabs = findTabs(container);
+        tabs.titles = findTitles(tabs.tabs);
+        tabs.headers = findHeaders(container);
+        tabs.select = select;
+        tabs.deselectAll = deselectAll;
+        tabs.select(0);
+
+        return true;
+    }
+
+    function getCheckBox() {
+        return document.getElementById("line-wrapping-toggle");
+    }
+
+    function getLabelForCheckBox() {
+        return document.getElementById("label-for-line-wrapping-toggle");
+    }
+
+    function findCodeBlocks() {
+        var spans = document.getElementById("tabs").getElementsByTagName("span");
+        var codeBlocks = [];
+        for (var i = 0; i < spans.length; ++i) {
+            if (spans[i].className.indexOf("code") >= 0) {
+                codeBlocks.push(spans[i]);
+            }
+        }
+        return codeBlocks;
+    }
+
+    function forAllCodeBlocks(operation) {
+        var codeBlocks = findCodeBlocks();
+
+        for (var i = 0; i < codeBlocks.length; ++i) {
+            operation(codeBlocks[i], "wrapped");
+        }
+    }
+
+    function toggleLineWrapping() {
+        var checkBox = getCheckBox();
+
+        if (checkBox.checked) {
+            forAllCodeBlocks(addClass);
+        } else {
+            forAllCodeBlocks(removeClass);
+        }
+    }
+
+    function initControls() {
+        if (findCodeBlocks().length > 0) {
+            var checkBox = getCheckBox();
+            var label = getLabelForCheckBox();
+
+            checkBox.onclick = toggleLineWrapping;
+            checkBox.checked = false;
+
+            removeClass(label, "hidden");
+         }
+    }
+
+    function switchTab() {
+        var id = this.id.substr(1);
+
+        for (var i = 0; i < tabs.tabs.length; i++) {
+            if (tabs.tabs[i].id === id) {
+                tabs.select(i);
+                break;
+            }
+        }
+
+        return false;
+    }
+
+    function select(i) {
+        this.deselectAll();
+
+        changeElementClass(this.tabs[i], "tab selected");
+        changeElementClass(this.headers[i], "selected");
+
+        while (this.headers[i].firstChild) {
+            this.headers[i].removeChild(this.headers[i].firstChild);
+        }
+
+        var h2 = document.createElement("H2");
+
+        h2.appendChild(document.createTextNode(this.titles[i]));
+        this.headers[i].appendChild(h2);
+    }
+
+    function deselectAll() {
+        for (var i = 0; i < this.tabs.length; i++) {
+            changeElementClass(this.tabs[i], "tab deselected");
+            changeElementClass(this.headers[i], "deselected");
+
+            while (this.headers[i].firstChild) {
+                this.headers[i].removeChild(this.headers[i].firstChild);
+            }
+
+            var a = document.createElement("A");
+
+            a.setAttribute("id", "ltab" + i);
+            a.setAttribute("href", "#tab" + i);
+            a.onclick = switchTab;
+            a.appendChild(document.createTextNode(this.titles[i]));
+
+            this.headers[i].appendChild(a);
+        }
+    }
+
+    function findTabs(container) {
+        return findChildElements(container, "DIV", "tab");
+    }
+
+    function findHeaders(container) {
+        var owner = findChildElements(container, "UL", "tabLinks");
+        return findChildElements(owner[0], "LI", null);
+    }
+
+    function findTitles(tabs) {
+        var titles = [];
+
+        for (var i = 0; i < tabs.length; i++) {
+            var tab = tabs[i];
+            var header = findChildElements(tab, "H2", null)[0];
+
+            header.parentNode.removeChild(header);
+
+            if (header.innerText) {
+                titles.push(header.innerText);
+            } else {
+                titles.push(header.textContent);
+            }
+        }
+
+        return titles;
+    }
+
+    function findChildElements(container, name, targetClass) {
+        var elements = [];
+        var children = container.childNodes;
+
+        for (var i = 0; i < children.length; i++) {
+            var child = children.item(i);
+
+            if (child.nodeType === 1 && child.nodeName === name) {
+                if (targetClass && child.className.indexOf(targetClass) < 0) {
+                    continue;
+                }
+
+                elements.push(child);
+            }
+        }
+
+        return elements;
+    }
+
+    // Entry point.
+
+    window.onload = function() {
+        initTabs();
+        initControls();
+    };
+} (window, window.document));
\ No newline at end of file
diff --git a/reports/profile/profile-2020-03-31-14-39-05.html b/reports/profile/profile-2020-03-31-14-39-05.html
new file mode 100644
index 0000000000..1548611f4d
--- /dev/null
+++ b/reports/profile/profile-2020-03-31-14-39-05.html
@@ -0,0 +1,165 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<meta http-equiv="x-ua-compatible" content="IE=edge"/>
+<title>Profile report</title>
+<link href="css/base-style.css" rel="stylesheet" type="text/css"/>
+<link href="css/style.css" rel="stylesheet" type="text/css"/>
+<script src="js/report.js" type="text/javascript"></script>
+</head>
+<body>
+<div id="content">
+<h1>Profile report</h1>
+<div id="header">
+<p>Profiled build: help </p>
+<p>Started on: 2020/03/31 - 14:39:05</p>
+</div>
+<div id="tabs">
+<ul class="tabLinks">
+<li>
+<a href="#tab0">Summary</a>
+</li>
+<li>
+<a href="#tab1">Configuration</a>
+</li>
+<li>
+<a href="#tab2">Dependency Resolution</a>
+</li>
+<li>
+<a href="#tab3">Artifact Transforms</a>
+</li>
+<li>
+<a href="#tab4">Task Execution</a>
+</li>
+</ul>
+<div class="tab" id="tab0">
+<h2>Summary</h2>
+<table>
+<thead>
+<tr>
+<th>Description</th>
+<th class="numeric">Duration</th>
+</tr>
+</thead>
+<tr>
+<td>Total Build Time</td>
+<td class="numeric">11.966s</td>
+</tr>
+<tr>
+<td>Startup</td>
+<td class="numeric">0.701s</td>
+</tr>
+<tr>
+<td>Settings and BuildSrc</td>
+<td class="numeric">0.002s</td>
+</tr>
+<tr>
+<td>Loading Projects</td>
+<td class="numeric">0.010s</td>
+</tr>
+<tr>
+<td>Configuring Projects</td>
+<td class="numeric">11.150s</td>
+</tr>
+<tr>
+<td>Artifact Transforms</td>
+<td class="numeric">0s</td>
+</tr>
+<tr>
+<td>Task Execution</td>
+<td class="numeric">0s</td>
+</tr>
+</table>
+</div>
+<div class="tab" id="tab1">
+<h2>Configuration</h2>
+<table>
+<thead>
+<tr>
+<th>Project</th>
+<th class="numeric">Duration</th>
+</tr>
+</thead>
+<tr>
+<td>All projects</td>
+<td class="numeric">11.150s</td>
+</tr>
+<tr>
+<td>:</td>
+<td class="numeric">11.150s</td>
+</tr>
+</table>
+</div>
+<div class="tab" id="tab2">
+<h2>Dependency Resolution</h2>
+<table>
+<thead>
+<tr>
+<th>Dependencies</th>
+<th class="numeric">Duration</th>
+</tr>
+</thead>
+<tr>
+<td>All dependencies</td>
+<td class="numeric">4.725s</td>
+</tr>
+<tr>
+<td>:classpath</td>
+<td class="numeric">2.866s</td>
+</tr>
+<tr>
+<td>detachedConfiguration1</td>
+<td class="numeric">1.857s</td>
+</tr>
+<tr>
+<td>detachedConfiguration2</td>
+<td class="numeric">0.002s</td>
+</tr>
+</table>
+</div>
+<div class="tab" id="tab3">
+<h2>Artifact Transforms</h2>
+<table>
+<thead>
+<tr>
+<th>Transform</th>
+<th class="numeric">Duration</th>
+</tr>
+</thead>
+<tr>
+<td>All transforms</td>
+<td class="numeric">0s</td>
+</tr>
+</table>
+</div>
+<div class="tab" id="tab4">
+<h2>Task Execution</h2>
+<table>
+<thead>
+<tr>
+<th>Task</th>
+<th class="numeric">Duration</th>
+<th>Result</th>
+</tr>
+</thead>
+<tr>
+<td>:</td>
+<td class="numeric">0s</td>
+<td>(total)</td>
+</tr>
+</table>
+</div>
+</div>
+<div id="footer">
+<p>
+<div>
+<label class="hidden" id="label-for-line-wrapping-toggle" for="line-wrapping-toggle">Wrap lines
+<input id="line-wrapping-toggle" type="checkbox" autocomplete="off"/>
+</label>
+</div>Generated by 
+<a href="http://www.gradle.org">Gradle 5.6.3</a> at Mar 31, 2020 2:39:17 PM</p>
+</div>
+</div>
+</body>
+</html>

From 353f587f3835ed4561019939946a56b89cd7b5e5 Mon Sep 17 00:00:00 2001
From: Eli Hart <eli.hart@airbnb.com>
Date: Wed, 6 May 2020 15:44:46 -0500
Subject: [PATCH 2/5] Update maven push plugin

---
 build.gradle                       | 8 +++-----
 epoxy-adapter/build.gradle         | 7 ++++++-
 epoxy-annotations/build.gradle     | 5 +++++
 epoxy-databinding/build.gradle     | 5 +++++
 epoxy-glide-preloader/build.gradle | 5 +++++
 epoxy-litho/build.gradle           | 5 +++++
 epoxy-modelfactory/build.gradle    | 5 +++++
 7 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1931eb98bb..5403ed2cf6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
 
-  ext.KOTLIN_VERSION = "1.3.61"
+  ext.KOTLIN_VERSION = "1.3.72"
   ext.ANDROID_PLUGIN_VERSION = '3.5.3'
 
   repositories {
@@ -14,10 +14,8 @@ buildscript {
     classpath "com.android.tools.build:gradle:$ANDROID_PLUGIN_VERSION"
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$KOTLIN_VERSION"
     // Upload with:
-    // ./gradlew assemble sourcesJar javadocsJar androidSourcesJar androidJavadocsJar uploadArchives --no-daemon --no-parallel
-    // Need to use snapshot version and explicitly include javadoc/sources tasks until
-    // https://github.com/vanniktech/gradle-maven-publish-plugin/issues/54 is fixed
-    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.9.0'
+    // ./gradlew clean uploadArchives --no-daemon --no-parallel
+    classpath 'com.vanniktech:gradle-maven-publish-plugin:0.11.1'
   }
 }
 
diff --git a/epoxy-adapter/build.gradle b/epoxy-adapter/build.gradle
index fa7d487885..6ff4b6fb42 100644
--- a/epoxy-adapter/build.gradle
+++ b/epoxy-adapter/build.gradle
@@ -1,8 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
-apply plugin: "com.vanniktech.maven.publish"
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "com.vanniktech.maven.publish"
+
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
 
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION
diff --git a/epoxy-annotations/build.gradle b/epoxy-annotations/build.gradle
index c5753fedf4..ca2a06f5aa 100644
--- a/epoxy-annotations/build.gradle
+++ b/epoxy-annotations/build.gradle
@@ -1,6 +1,11 @@
 apply plugin: 'java'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 sourceCompatibility = rootProject.JAVA_SOURCE_VERSION
 targetCompatibility = rootProject.JAVA_TARGET_VERSION
 
diff --git a/epoxy-databinding/build.gradle b/epoxy-databinding/build.gradle
index aff82d2c39..5781a21cd4 100644
--- a/epoxy-databinding/build.gradle
+++ b/epoxy-databinding/build.gradle
@@ -1,6 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION
 
diff --git a/epoxy-glide-preloader/build.gradle b/epoxy-glide-preloader/build.gradle
index b6cba45eed..09a8e1308e 100644
--- a/epoxy-glide-preloader/build.gradle
+++ b/epoxy-glide-preloader/build.gradle
@@ -3,6 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+    // must use legacy mode until we update to AGP 3.6.x
+    useLegacyMode = true
+}
+
 android {
     compileSdkVersion rootProject.COMPILE_SDK_VERSION
 
diff --git a/epoxy-litho/build.gradle b/epoxy-litho/build.gradle
index a50b1eb399..8c8e45fef2 100644
--- a/epoxy-litho/build.gradle
+++ b/epoxy-litho/build.gradle
@@ -1,6 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION
 
diff --git a/epoxy-modelfactory/build.gradle b/epoxy-modelfactory/build.gradle
index 11adf6cd7c..e1b193b52a 100644
--- a/epoxy-modelfactory/build.gradle
+++ b/epoxy-modelfactory/build.gradle
@@ -1,6 +1,11 @@
 apply plugin: 'com.android.library'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION
 

From 34fd6505214e0cab59ff368aa0a59b331b86bed9 Mon Sep 17 00:00:00 2001
From: Eli Hart <eli.hart@airbnb.com>
Date: Wed, 6 May 2020 15:45:06 -0500
Subject: [PATCH 3/5] more push updates

---
 epoxy-paging/build.gradle    | 5 +++++
 epoxy-processor/build.gradle | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/epoxy-paging/build.gradle b/epoxy-paging/build.gradle
index 0734502379..ec1183f115 100644
--- a/epoxy-paging/build.gradle
+++ b/epoxy-paging/build.gradle
@@ -3,6 +3,11 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-kapt'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+  // must use legacy mode until we update to AGP 3.6.x
+  useLegacyMode = true
+}
+
 android {
   compileSdkVersion rootProject.COMPILE_SDK_VERSION
 
diff --git a/epoxy-processor/build.gradle b/epoxy-processor/build.gradle
index 8a175c347d..acf5476379 100644
--- a/epoxy-processor/build.gradle
+++ b/epoxy-processor/build.gradle
@@ -3,6 +3,11 @@ import org.gradle.internal.jvm.Jvm
 apply plugin: 'kotlin'
 apply plugin: "com.vanniktech.maven.publish"
 
+mavenPublish {
+    // must use legacy mode until we update to AGP 3.6.x
+    useLegacyMode = true
+}
+
 configurations.all { strategy ->
     strategy.resolutionStrategy.force rootProject.deps.assertj, rootProject.deps.googleTestingCompile
 }

From 1972e91bc63935b763ffab5854437d370a9db1c0 Mon Sep 17 00:00:00 2001
From: Eli Hart <eli.hart@airbnb.com>
Date: Wed, 6 May 2020 15:45:19 -0500
Subject: [PATCH 4/5] fix ruby processor test update script

---
 update_processor_test_resources.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/update_processor_test_resources.rb b/update_processor_test_resources.rb
index ee219b1a62..f3941183d6 100644
--- a/update_processor_test_resources.rb
+++ b/update_processor_test_resources.rb
@@ -9,6 +9,7 @@
 require 'nokogiri'
 
 def updateTestClass(test_class_result)
+  puts "\nUpdating " + test_class_result + "\n"
   page = Nokogiri::HTML(open(test_class_result))
 
   # Failing processor tests have their output in a <pre></pre> block
@@ -20,7 +21,7 @@ def updateTestClass(test_class_result)
     end
 
     # We expect to see a line like:
-    # Expected file: </Users/eli_hart/repos/epoxy/epoxy-processortest/build/intermediates/classes/test/debug/ModelWithViewClickListener_.java>;
+    # Expected file: </ModelWithViewClickListener_.java>;
     # Which tells us where the original processor test file lives
     expected_file_match = /Expected file: <([^>]*)>/m.match(preBlock)
     if expected_file_match.nil? || expected_file_match.captures.empty?
@@ -29,7 +30,9 @@ def updateTestClass(test_class_result)
     end
 
     # The test copies the source file to the build folder. We need to modify the original file to update its expected source
-    expected_source_file_path = expected_file_match.captures[0].sub "build/intermediates/sourceFolderJavaResources/debug", "src/test/resources"
+    expected_source_file_name = expected_file_match.captures[0]
+    module_path = test_class_result.split("build/reports/").first
+    expected_source_file_path = module_path + "src/test/resources" + expected_source_file_name
 
     # The error message includes the source code that was generated. We use a regex to extract the source from the following expected pattern
     #
@@ -50,9 +53,7 @@ def updateTestClass(test_class_result)
 
     # Finally we simply overwrite the original expected test source with the actual test output in order to update it
     actual_source = actual_source_match.captures[0]
-    File.open(expected_source_file_path, "w") do |f|
-      f.write actual_source
-    end
+    File.write(expected_source_file_path, actual_source)
   end
 end
 

From 144cdde37e568c725ea4d8a11e3e5eb8741ebe3f Mon Sep 17 00:00:00 2001
From: Eli Hart <eli.hart@airbnb.com>
Date: Wed, 6 May 2020 15:45:34 -0500
Subject: [PATCH 5/5] update processor tests for hashcode result property

---
 .../resources/AllTypesModelViewModel_.java    | 50 +++++++--------
 .../BasicModelWithFinalAttribute_.java        | 22 +++----
 .../CallbackPropModelViewModel_.java          | 22 +++----
 ...AttributeDifferentNameModelViewModel_.java | 24 ++++---
 ...ortedAttributeSameNameModelViewModel_.java | 24 ++++---
 ...ngleSupportedAttributeModelViewModel_.java | 24 ++++---
 .../resources/ListSubtypeModelViewModel_.java | 22 +++----
 .../ModelFactoryBaseModelViewModel_.java      | 31 +++++-----
 .../ModelFactoryBasicModelWithAttribute_.java | 17 ++---
 .../resources/TextPropModelViewModel_.java    | 22 +++----
 .../resources/AbstractModelWithHolder_.java   | 22 +++----
 .../AutoLayoutModelViewMatchParentModel_.java | 22 +++----
 .../resources/AutoLayoutModelViewModel_.java  | 22 +++----
 .../BaseModelFromPackageConfigViewModel_.java | 22 +++----
 ...ModelOverridesPackageConfigViewModel_.java | 22 +++----
 .../test/resources/BaseModelViewModel_.java   | 22 +++----
 .../BaseModelViewWithSuperDiffBindModel_.java | 22 +++----
 .../BaseModelWithAttributeViewModel_.java     | 24 ++++---
 .../resources/BasicModelWithAttribute_.java   | 22 +++----
 .../CustomPackageLayoutPatternViewModel_.java | 20 +++---
 ...ngModelWithAllFieldTypesNoValidation_.java | 62 +++++++++----------
 .../DataBindingModelWithAllFieldTypes_.java   | 62 +++++++++----------
 ...DefaultPackageLayoutPatternViewModel_.java | 20 +++---
 .../test/resources/DoNotHashViewModel_.java   | 26 ++++----
 .../EpoxyModelGroupWithAnnotations_.java      | 14 ++---
 ...ayoutMethodNextParentLayout$NoLayout_.java | 22 +++----
 ...MethodNextParentLayout$StillNoLayout_.java | 20 +++---
 ...outMethodNextParentLayout$WithLayout_.java | 20 +++---
 ...ultLayoutMethodParentLayout$NoLayout_.java | 22 +++----
 ...tLayoutMethodParentLayout$WithLayout_.java | 20 +++---
 .../GenerateDefaultLayoutMethod_.java         | 22 +++----
 .../GeneratedModelSuffixViewSuffix_.java      | 20 +++---
 .../resources/GridSpanCountViewModel_.java    | 22 +++----
 .../IgnoreRequireHashCodeViewModel_.java      | 22 +++----
 .../resources/LayoutOverloadsViewModel_.java  | 20 +++---
 .../src/test/resources/ModelDoNotHash_.java   | 24 ++++---
 .../resources/ModelDoNotUseInToString_.java   | 26 ++++----
 .../resources/ModelForRProcessingTest_.java   | 22 +++----
 .../ModelForTestingDuplicateRValues_.java     | 22 +++----
 .../test/resources/ModelNoValidation_.java    | 22 +++----
 .../ModelReturningClassTypeWithVarargs_.java  | 22 +++----
 .../resources/ModelReturningClassType_.java   | 22 +++----
 .../ModelViewExtendingSuperClassModel_.java   | 24 ++++---
 .../resources/ModelViewSuperClassModel_.java  | 22 +++----
 .../resources/ModelViewWithParisModel_.java   | 33 +++++-----
 .../ModelWithAbstractClassAndAnnotation_.java | 20 +++---
 .../resources/ModelWithAllFieldTypes_.java    | 62 +++++++++----------
 .../ModelWithAllPrivateFieldTypes_.java       | 62 +++++++++----------
 ...WithAnnotatedClassAndSuperAttributes_.java | 22 +++----
 ...WithAnnotatedClassAndSuperAttributes_.java | 22 +++----
 .../resources/ModelWithAnnotatedClass_.java   | 20 +++---
 .../test/resources/ModelWithAnnotation_.java  | 20 +++---
 .../ModelWithCheckedChangeListener_.java      | 14 ++---
 .../resources/ModelWithConstructors_.java     | 22 +++----
 .../ModelWithDataBindingBindingModel_.java    | 22 +++----
 ...aBindingWithoutDonothashBindingModel_.java | 24 ++++---
 .../resources/ModelWithFieldAnnotation_.java  | 22 +++----
 .../test/resources/ModelWithFinalField_.java  | 22 +++----
 .../src/test/resources/ModelWithIntDef_.java  | 22 +++----
 ...ldWithSameAsFieldGetterAndSetterName_.java | 22 +++----
 .../ModelWithPrivateViewClickListener_.java   | 22 +++----
 ...tributes$SubModelWithSuperAttributes_.java | 24 ++++---
 .../resources/ModelWithSuperAttributes_.java  | 22 +++----
 .../src/test/resources/ModelWithSuper_.java   | 22 +++----
 .../src/test/resources/ModelWithType_.java    | 22 +++----
 .../ModelWithVarargsConstructors_.java        | 24 ++++---
 .../ModelWithViewClickListener_.java          | 20 +++---
 .../ModelWithViewLongClickListener_.java      | 20 +++---
 .../src/test/resources/ModelWithoutHash_.java | 24 ++++---
 .../test/resources/ModelWithoutSetter_.java   | 22 +++----
 .../resources/NullOnRecycleViewModel_.java    | 22 +++----
 .../resources/OnViewRecycledViewModel_.java   | 22 +++----
 .../OnVisibilityChangedViewModel_.java        | 16 ++---
 .../OnVisibilityStateChangedViewModel_.java   | 19 +++---
 .../resources/PropDefaultsViewModel_.java     | 32 +++++-----
 .../test/resources/PropGroupsViewModel_.java  | 48 +++++++-------
 ...tInViewModelAnnotationWorksViewModel_.java | 20 +++---
 .../test/resources/SavedStateViewModel_.java  | 22 +++----
 .../TestAfterBindPropsViewModel_.java         | 24 ++++---
 .../resources/TestCallbackPropViewModel_.java | 22 +++----
 .../TestFieldPropCallbackPropViewModel_.java  | 22 +++----
 .../TestFieldPropChildViewModel_.java         | 27 ++++----
 ...estFieldPropDoNotHashOptionViewModel_.java | 22 +++----
 ...nerateStringOverloadsOptionViewModel_.java | 22 +++----
 ...IgnoreRequireHashCodeOptionViewModel_.java | 22 +++----
 .../TestFieldPropModelPropViewModel_.java     | 22 +++----
 ...ieldPropNullOnRecycleOptionViewModel_.java | 38 ++++++------
 .../TestFieldPropTextPropViewModel_.java      | 22 +++----
 .../resources/TestManyTypesViewModel_.java    | 48 +++++++-------
 .../TestNullStringOverloadsViewModel_.java    | 22 +++----
 .../TestStringOverloadsViewModel_.java        | 26 ++++----
 .../resources/TestTextPropViewModel_.java     | 22 +++----
 .../resources/TextPropDefaultViewModel_.java  | 24 ++++---
 update_processor_test_resources.rb            | 11 +++-
 94 files changed, 1086 insertions(+), 1242 deletions(-)

diff --git a/epoxy-modelfactorytest/src/test/resources/AllTypesModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/AllTypesModelViewModel_.java
index 9f5ff40c9c..e87e60ee01 100644
--- a/epoxy-modelfactorytest/src/test/resources/AllTypesModelViewModel_.java
+++ b/epoxy-modelfactorytest/src/test/resources/AllTypesModelViewModel_.java
@@ -290,8 +290,7 @@ public void onVisibilityStateChanged(int visibilityState, final AllTypesModelVie
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AllTypesModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<AllTypesModelViewModel_, AllTypesModelView> listener) {
     onMutation();
@@ -313,8 +312,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AllTypesModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<AllTypesModelViewModel_, AllTypesModelView> listener) {
     onMutation();
@@ -789,29 +787,29 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
     long temp;
-    result = 31 * result + (booleanValue_Boolean ? 1 : 0);
-    result = 31 * result + (boxedBooleanValue_Boolean != null ? boxedBooleanValue_Boolean.hashCode() : 0);
-    result = 31 * result + (charSequenceValue_CharSequence != null ? charSequenceValue_CharSequence.hashCode() : 0);
-    result = 31 * result + (boxedDoubleValue_Double != null ? boxedDoubleValue_Double.hashCode() : 0);
+    _result = 31 * _result + (booleanValue_Boolean ? 1 : 0);
+    _result = 31 * _result + (boxedBooleanValue_Boolean != null ? boxedBooleanValue_Boolean.hashCode() : 0);
+    _result = 31 * _result + (charSequenceValue_CharSequence != null ? charSequenceValue_CharSequence.hashCode() : 0);
+    _result = 31 * _result + (boxedDoubleValue_Double != null ? boxedDoubleValue_Double.hashCode() : 0);
     temp = Double.doubleToLongBits(doubleValue_Double);
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
-    result = 31 * result + drawableRes_Int;
-    result = 31 * result + (epoxyModelList_List != null ? epoxyModelList_List.hashCode() : 0);
-    result = 31 * result + intValue_Int;
-    result = 31 * result + (boxedIntValue_Integer != null ? boxedIntValue_Integer.hashCode() : 0);
-    result = 31 * result + (int) (longValue_Long ^ (longValue_Long >>> 32));
-    result = 31 * result + (boxedLongValue_Long != null ? boxedLongValue_Long.hashCode() : 0);
-    result = 31 * result + (onClickListener_OnClickListener != null ? 1 : 0);
-    result = 31 * result + rawRes_Int;
-    result = 31 * result + (stringValue_String != null ? stringValue_String.hashCode() : 0);
-    result = 31 * result + (stringList_List != null ? stringList_List.hashCode() : 0);
-    return result;
+    _result = 31 * _result + (int) (temp ^ (temp >>> 32));
+    _result = 31 * _result + drawableRes_Int;
+    _result = 31 * _result + (epoxyModelList_List != null ? epoxyModelList_List.hashCode() : 0);
+    _result = 31 * _result + intValue_Int;
+    _result = 31 * _result + (boxedIntValue_Integer != null ? boxedIntValue_Integer.hashCode() : 0);
+    _result = 31 * _result + (int) (longValue_Long ^ (longValue_Long >>> 32));
+    _result = 31 * _result + (boxedLongValue_Long != null ? boxedLongValue_Long.hashCode() : 0);
+    _result = 31 * _result + (onClickListener_OnClickListener != null ? 1 : 0);
+    _result = 31 * _result + rawRes_Int;
+    _result = 31 * _result + (stringValue_String != null ? stringValue_String.hashCode() : 0);
+    _result = 31 * _result + (stringList_List != null ? stringList_List.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -890,4 +888,4 @@ public static AllTypesModelViewModel_ from(ModelProperties properties) {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute_.java b/epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute_.java
index 5fe17b82e8..2095211325 100644
--- a/epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute_.java
+++ b/epoxy-modelfactorytest/src/test/resources/BasicModelWithFinalAttribute_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BasicModelWithFinalAttribute_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<BasicModelWithFinalAttribute_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BasicModelWithFinalAttribute_ onVisibilityChanged(
       OnModelVisibilityChangedListener<BasicModelWithFinalAttribute_, Object> listener) {
     onMutation();
@@ -237,13 +235,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -252,4 +250,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-modelfactorytest/src/test/resources/CallbackPropModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/CallbackPropModelViewModel_.java
index ab2912a638..d6315a4a40 100644
--- a/epoxy-modelfactorytest/src/test/resources/CallbackPropModelViewModel_.java
+++ b/epoxy-modelfactorytest/src/test/resources/CallbackPropModelViewModel_.java
@@ -118,8 +118,7 @@ public void onVisibilityStateChanged(int visibilityState, final CallbackPropMode
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public CallbackPropModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<CallbackPropModelViewModel_, CallbackPropModelView> listener) {
     onMutation();
@@ -141,8 +140,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public CallbackPropModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<CallbackPropModelViewModel_, CallbackPropModelView> listener) {
     onMutation();
@@ -301,13 +299,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onClickListener_OnClickListener != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onClickListener_OnClickListener != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -330,4 +328,4 @@ public static CallbackPropModelViewModel_ from(ModelProperties properties) {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java
index a988ccf641..aad1136641 100644
--- a/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java
+++ b/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_.java
@@ -144,8 +144,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_, GroupPropMultipleSupportedAttributeDifferentNameModelView> listener) {
     onMutation();
@@ -168,8 +167,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_, GroupPropMultipleSupportedAttributeDifferentNameModelView> listener) {
     onMutation();
@@ -344,14 +342,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (titleString_String != null ? titleString_String.hashCode() : 0);
-    result = 31 * result + titleInt_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (titleString_String != null ? titleString_String.hashCode() : 0);
+    _result = 31 * _result + titleInt_Int;
+    return _result;
   }
 
   @Override
@@ -378,4 +376,4 @@ public static GroupPropMultipleSupportedAttributeDifferentNameModelViewModel_ fr
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java
index cea8debb6b..a4b7e8ad92 100644
--- a/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java
+++ b/epoxy-modelfactorytest/src/test/resources/GroupPropMultipleSupportedAttributeSameNameModelViewModel_.java
@@ -144,8 +144,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropMultipleSupportedAttributeSameNameModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GroupPropMultipleSupportedAttributeSameNameModelViewModel_, GroupPropMultipleSupportedAttributeSameNameModelView> listener) {
     onMutation();
@@ -168,8 +167,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropMultipleSupportedAttributeSameNameModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GroupPropMultipleSupportedAttributeSameNameModelViewModel_, GroupPropMultipleSupportedAttributeSameNameModelView> listener) {
     onMutation();
@@ -342,14 +340,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (titleString_String != null ? titleString_String.hashCode() : 0);
-    result = 31 * result + titleInt_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (titleString_String != null ? titleString_String.hashCode() : 0);
+    _result = 31 * _result + titleInt_Int;
+    return _result;
   }
 
   @Override
@@ -376,4 +374,4 @@ public static GroupPropMultipleSupportedAttributeSameNameModelViewModel_ from(
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-modelfactorytest/src/test/resources/GroupPropSingleSupportedAttributeModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/GroupPropSingleSupportedAttributeModelViewModel_.java
index 097c11193c..49c2e3b51e 100644
--- a/epoxy-modelfactorytest/src/test/resources/GroupPropSingleSupportedAttributeModelViewModel_.java
+++ b/epoxy-modelfactorytest/src/test/resources/GroupPropSingleSupportedAttributeModelViewModel_.java
@@ -142,8 +142,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropSingleSupportedAttributeModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GroupPropSingleSupportedAttributeModelViewModel_, GroupPropSingleSupportedAttributeModelView> listener) {
     onMutation();
@@ -166,8 +165,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GroupPropSingleSupportedAttributeModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GroupPropSingleSupportedAttributeModelViewModel_, GroupPropSingleSupportedAttributeModelView> listener) {
     onMutation();
@@ -342,14 +340,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_String != null ? title_String.hashCode() : 0);
-    result = 31 * result + (title_Object != null ? title_Object.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_String != null ? title_String.hashCode() : 0);
+    _result = 31 * _result + (title_Object != null ? title_Object.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -373,4 +371,4 @@ public static GroupPropSingleSupportedAttributeModelViewModel_ from(ModelPropert
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-modelfactorytest/src/test/resources/ListSubtypeModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/ListSubtypeModelViewModel_.java
index e1064cebd9..5cf481e9f8 100644
--- a/epoxy-modelfactorytest/src/test/resources/ListSubtypeModelViewModel_.java
+++ b/epoxy-modelfactorytest/src/test/resources/ListSubtypeModelViewModel_.java
@@ -123,8 +123,7 @@ public void onVisibilityStateChanged(int visibilityState, final ListSubtypeModel
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ListSubtypeModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ListSubtypeModelViewModel_, ListSubtypeModelView> listener) {
     onMutation();
@@ -146,8 +145,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ListSubtypeModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ListSubtypeModelViewModel_, ListSubtypeModelView> listener) {
     onMutation();
@@ -293,13 +291,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (stringArrayList_ArrayList != null ? stringArrayList_ArrayList.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (stringArrayList_ArrayList != null ? stringArrayList_ArrayList.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -313,4 +311,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-modelfactorytest/src/test/resources/ModelFactoryBaseModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/ModelFactoryBaseModelViewModel_.java
index c7af9f12d1..b7b31917dc 100644
--- a/epoxy-modelfactorytest/src/test/resources/ModelFactoryBaseModelViewModel_.java
+++ b/epoxy-modelfactorytest/src/test/resources/ModelFactoryBaseModelViewModel_.java
@@ -110,7 +110,8 @@ public ModelFactoryBaseModelViewModel_ onUnbind(
   }
 
   @Override
-  public void onVisibilityStateChanged(int visibilityState, final ModelFactoryBaseModelView object) {
+  public void onVisibilityStateChanged(int visibilityState,
+      final ModelFactoryBaseModelView object) {
     if (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null) {
       onModelVisibilityStateChangedListener_epoxyGeneratedModel.onVisibilityStateChanged(this, object, visibilityState);
     }
@@ -122,8 +123,7 @@ public void onVisibilityStateChanged(int visibilityState, final ModelFactoryBase
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelFactoryBaseModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelFactoryBaseModelViewModel_, ModelFactoryBaseModelView> listener) {
     onMutation();
@@ -145,8 +145,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelFactoryBaseModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelFactoryBaseModelViewModel_, ModelFactoryBaseModelView> listener) {
     onMutation();
@@ -199,7 +198,8 @@ public ModelFactoryBaseModelViewModel_ id(@Nullable CharSequence arg0) {
   }
 
   @Override
-  public ModelFactoryBaseModelViewModel_ id(@Nullable CharSequence arg0, @Nullable CharSequence... arg1) {
+  public ModelFactoryBaseModelViewModel_ id(@Nullable CharSequence arg0,
+      @Nullable CharSequence... arg1) {
     super.id(arg0, arg1);
     return this;
   }
@@ -217,7 +217,8 @@ public ModelFactoryBaseModelViewModel_ layout(@LayoutRes int arg0) {
   }
 
   @Override
-  public ModelFactoryBaseModelViewModel_ spanSizeOverride(@Nullable EpoxyModel.SpanSizeOverrideCallback arg0) {
+  public ModelFactoryBaseModelViewModel_ spanSizeOverride(
+      @Nullable EpoxyModel.SpanSizeOverrideCallback arg0) {
     super.spanSizeOverride(arg0);
     return this;
   }
@@ -290,13 +291,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_String != null ? title_String.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_String != null ? title_String.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -319,4 +320,4 @@ public static ModelFactoryBaseModelViewModel_ from(ModelProperties properties) {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-modelfactorytest/src/test/resources/ModelFactoryBasicModelWithAttribute_.java b/epoxy-modelfactorytest/src/test/resources/ModelFactoryBasicModelWithAttribute_.java
index 872ca0b7c8..370be3eeca 100644
--- a/epoxy-modelfactorytest/src/test/resources/ModelFactoryBasicModelWithAttribute_.java
+++ b/epoxy-modelfactorytest/src/test/resources/ModelFactoryBasicModelWithAttribute_.java
@@ -156,7 +156,8 @@ public ModelFactoryBasicModelWithAttribute_ id(@Nullable CharSequence arg0) {
   }
 
   @Override
-  public ModelFactoryBasicModelWithAttribute_ id(@Nullable CharSequence arg0, @Nullable CharSequence... arg1) {
+  public ModelFactoryBasicModelWithAttribute_ id(@Nullable CharSequence arg0,
+      @Nullable CharSequence... arg1) {
     super.id(arg0, arg1);
     return this;
   }
@@ -241,13 +242,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
diff --git a/epoxy-modelfactorytest/src/test/resources/TextPropModelViewModel_.java b/epoxy-modelfactorytest/src/test/resources/TextPropModelViewModel_.java
index 776b0f4329..8b8549ffc7 100644
--- a/epoxy-modelfactorytest/src/test/resources/TextPropModelViewModel_.java
+++ b/epoxy-modelfactorytest/src/test/resources/TextPropModelViewModel_.java
@@ -124,8 +124,7 @@ public void onVisibilityStateChanged(int visibilityState, final TextPropModelVie
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TextPropModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TextPropModelViewModel_, TextPropModelView> listener) {
     onMutation();
@@ -147,8 +146,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TextPropModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TextPropModelViewModel_, TextPropModelView> listener) {
     onMutation();
@@ -335,13 +333,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -364,4 +362,4 @@ public static TextPropModelViewModel_ from(ModelProperties properties) {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/AbstractModelWithHolder_.java b/epoxy-processortest/src/test/resources/AbstractModelWithHolder_.java
index 65ac52f176..91ab8760e6 100644
--- a/epoxy-processortest/src/test/resources/AbstractModelWithHolder_.java
+++ b/epoxy-processortest/src/test/resources/AbstractModelWithHolder_.java
@@ -93,8 +93,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AbstractModelWithHolder_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<AbstractModelWithHolder_, AbstractModelWithHolder.Holder> listener) {
     onMutation();
@@ -116,8 +115,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AbstractModelWithHolder_ onVisibilityChanged(
       OnModelVisibilityChangedListener<AbstractModelWithHolder_, AbstractModelWithHolder.Holder> listener) {
     onMutation();
@@ -250,13 +248,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -265,4 +263,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/AutoLayoutModelViewMatchParentModel_.java b/epoxy-processortest/src/test/resources/AutoLayoutModelViewMatchParentModel_.java
index 2f1133fea5..8befe63200 100644
--- a/epoxy-processortest/src/test/resources/AutoLayoutModelViewMatchParentModel_.java
+++ b/epoxy-processortest/src/test/resources/AutoLayoutModelViewMatchParentModel_.java
@@ -130,8 +130,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AutoLayoutModelViewMatchParentModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<AutoLayoutModelViewMatchParentModel_, AutoLayoutModelViewMatchParent> listener) {
     onMutation();
@@ -153,8 +152,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AutoLayoutModelViewMatchParentModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<AutoLayoutModelViewMatchParentModel_, AutoLayoutModelViewMatchParent> listener) {
     onMutation();
@@ -295,13 +293,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value_Int;
+    return _result;
   }
 
   @Override
@@ -315,4 +313,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/AutoLayoutModelViewModel_.java b/epoxy-processortest/src/test/resources/AutoLayoutModelViewModel_.java
index e12d4bccfd..3f4ff1bad0 100644
--- a/epoxy-processortest/src/test/resources/AutoLayoutModelViewModel_.java
+++ b/epoxy-processortest/src/test/resources/AutoLayoutModelViewModel_.java
@@ -129,8 +129,7 @@ public void onVisibilityStateChanged(int visibilityState, final AutoLayoutModelV
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AutoLayoutModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<AutoLayoutModelViewModel_, AutoLayoutModelView> listener) {
     onMutation();
@@ -152,8 +151,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public AutoLayoutModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<AutoLayoutModelViewModel_, AutoLayoutModelView> listener) {
     onMutation();
@@ -293,13 +291,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value_Int;
+    return _result;
   }
 
   @Override
@@ -313,4 +311,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/BaseModelFromPackageConfigViewModel_.java b/epoxy-processortest/src/test/resources/BaseModelFromPackageConfigViewModel_.java
index 42bec8f8ef..62ce462ce1 100644
--- a/epoxy-processortest/src/test/resources/BaseModelFromPackageConfigViewModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelFromPackageConfigViewModel_.java
@@ -126,8 +126,7 @@ public void onVisibilityStateChanged(int visibilityState, final BaseModelView ob
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -149,8 +148,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -294,13 +292,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -314,4 +312,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/BaseModelOverridesPackageConfigViewModel_.java b/epoxy-processortest/src/test/resources/BaseModelOverridesPackageConfigViewModel_.java
index e12b4c5c04..4858d7dd72 100644
--- a/epoxy-processortest/src/test/resources/BaseModelOverridesPackageConfigViewModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelOverridesPackageConfigViewModel_.java
@@ -122,8 +122,7 @@ public void onVisibilityStateChanged(int visibilityState, final BaseModelView ob
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -145,8 +144,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -290,13 +288,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -310,4 +308,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/BaseModelViewModel_.java b/epoxy-processortest/src/test/resources/BaseModelViewModel_.java
index 52f9886b77..d9b69923b7 100644
--- a/epoxy-processortest/src/test/resources/BaseModelViewModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelViewModel_.java
@@ -126,8 +126,7 @@ public void onVisibilityStateChanged(int visibilityState, final BaseModelView ob
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -149,8 +148,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -294,13 +292,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -314,4 +312,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/BaseModelViewWithSuperDiffBindModel_.java b/epoxy-processortest/src/test/resources/BaseModelViewWithSuperDiffBindModel_.java
index 1e40f68a00..bd5368f4a2 100644
--- a/epoxy-processortest/src/test/resources/BaseModelViewWithSuperDiffBindModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelViewWithSuperDiffBindModel_.java
@@ -126,8 +126,7 @@ public void onVisibilityStateChanged(int visibilityState, final BaseModelView ob
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -149,8 +148,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -294,13 +292,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -314,4 +312,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/BaseModelWithAttributeViewModel_.java b/epoxy-processortest/src/test/resources/BaseModelWithAttributeViewModel_.java
index b3714e4063..33e7211842 100644
--- a/epoxy-processortest/src/test/resources/BaseModelWithAttributeViewModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelWithAttributeViewModel_.java
@@ -126,8 +126,7 @@ public void onVisibilityStateChanged(int visibilityState, final BaseModelView ob
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -149,8 +148,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BaseModelViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<BaseModelViewModel_, BaseModelView> listener) {
     onMutation();
@@ -309,14 +307,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
-    result = 31 * result + (baseModelString != null ? baseModelString.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
+    _result = 31 * _result + (baseModelString != null ? baseModelString.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -331,4 +329,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/BasicModelWithAttribute_.java b/epoxy-processortest/src/test/resources/BasicModelWithAttribute_.java
index a633143e24..d4ef6dbdbd 100644
--- a/epoxy-processortest/src/test/resources/BasicModelWithAttribute_.java
+++ b/epoxy-processortest/src/test/resources/BasicModelWithAttribute_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BasicModelWithAttribute_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<BasicModelWithAttribute_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public BasicModelWithAttribute_ onVisibilityChanged(
       OnModelVisibilityChangedListener<BasicModelWithAttribute_, Object> listener) {
     onMutation();
@@ -243,13 +241,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -258,4 +256,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/CustomPackageLayoutPatternViewModel_.java b/epoxy-processortest/src/test/resources/CustomPackageLayoutPatternViewModel_.java
index 8d12bab6a1..3ea8d5a431 100644
--- a/epoxy-processortest/src/test/resources/CustomPackageLayoutPatternViewModel_.java
+++ b/epoxy-processortest/src/test/resources/CustomPackageLayoutPatternViewModel_.java
@@ -107,8 +107,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public CustomPackageLayoutPatternViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<CustomPackageLayoutPatternViewModel_, CustomPackageLayoutPatternView> listener) {
     onMutation();
@@ -130,8 +129,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public CustomPackageLayoutPatternViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<CustomPackageLayoutPatternViewModel_, CustomPackageLayoutPatternView> listener) {
     onMutation();
@@ -253,12 +251,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -271,4 +269,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypesNoValidation_.java b/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypesNoValidation_.java
index b6efa3e06e..0b483300d1 100644
--- a/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypesNoValidation_.java
+++ b/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypesNoValidation_.java
@@ -96,8 +96,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public DataBindingModelWithAllFieldTypesNoValidation_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<DataBindingModelWithAllFieldTypesNoValidation_, DataBindingEpoxyModel.DataBindingHolder> listener) {
     onMutation();
@@ -119,8 +118,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public DataBindingModelWithAllFieldTypesNoValidation_ onVisibilityChanged(
       OnModelVisibilityChangedListener<DataBindingModelWithAllFieldTypesNoValidation_, DataBindingEpoxyModel.DataBindingHolder> listener) {
     onMutation();
@@ -629,35 +627,35 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
     long temp;
-    result = 31 * result + valueInt;
-    result = 31 * result + (valueInteger != null ? valueInteger.hashCode() : 0);
-    result = 31 * result + valueShort;
-    result = 31 * result + (valueShortWrapper != null ? valueShortWrapper.hashCode() : 0);
-    result = 31 * result + valueChar;
-    result = 31 * result + (valueCharacter != null ? valueCharacter.hashCode() : 0);
-    result = 31 * result + valuebByte;
-    result = 31 * result + (valueByteWrapper != null ? valueByteWrapper.hashCode() : 0);
-    result = 31 * result + (int) (valueLong ^ (valueLong >>> 32));
-    result = 31 * result + (valueLongWrapper != null ? valueLongWrapper.hashCode() : 0);
+    _result = 31 * _result + valueInt;
+    _result = 31 * _result + (valueInteger != null ? valueInteger.hashCode() : 0);
+    _result = 31 * _result + valueShort;
+    _result = 31 * _result + (valueShortWrapper != null ? valueShortWrapper.hashCode() : 0);
+    _result = 31 * _result + valueChar;
+    _result = 31 * _result + (valueCharacter != null ? valueCharacter.hashCode() : 0);
+    _result = 31 * _result + valuebByte;
+    _result = 31 * _result + (valueByteWrapper != null ? valueByteWrapper.hashCode() : 0);
+    _result = 31 * _result + (int) (valueLong ^ (valueLong >>> 32));
+    _result = 31 * _result + (valueLongWrapper != null ? valueLongWrapper.hashCode() : 0);
     temp = Double.doubleToLongBits(valueDouble);
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
-    result = 31 * result + (valueDoubleWrapper != null ? valueDoubleWrapper.hashCode() : 0);
-    result = 31 * result + (valueFloat != +0.0f ? Float.floatToIntBits(valueFloat) : 0);
-    result = 31 * result + (valueFloatWrapper != null ? valueFloatWrapper.hashCode() : 0);
-    result = 31 * result + (valueBoolean ? 1 : 0);
-    result = 31 * result + (valueBooleanWrapper != null ? valueBooleanWrapper.hashCode() : 0);
-    result = 31 * result + Arrays.hashCode(valueIntArray);
-    result = 31 * result + Arrays.hashCode(valueObjectArray);
-    result = 31 * result + (valueString != null ? valueString.hashCode() : 0);
-    result = 31 * result + (valueObject != null ? valueObject.hashCode() : 0);
-    result = 31 * result + (valueList != null ? valueList.hashCode() : 0);
-    return result;
+    _result = 31 * _result + (int) (temp ^ (temp >>> 32));
+    _result = 31 * _result + (valueDoubleWrapper != null ? valueDoubleWrapper.hashCode() : 0);
+    _result = 31 * _result + (valueFloat != +0.0f ? Float.floatToIntBits(valueFloat) : 0);
+    _result = 31 * _result + (valueFloatWrapper != null ? valueFloatWrapper.hashCode() : 0);
+    _result = 31 * _result + (valueBoolean ? 1 : 0);
+    _result = 31 * _result + (valueBooleanWrapper != null ? valueBooleanWrapper.hashCode() : 0);
+    _result = 31 * _result + Arrays.hashCode(valueIntArray);
+    _result = 31 * _result + Arrays.hashCode(valueObjectArray);
+    _result = 31 * _result + (valueString != null ? valueString.hashCode() : 0);
+    _result = 31 * _result + (valueObject != null ? valueObject.hashCode() : 0);
+    _result = 31 * _result + (valueList != null ? valueList.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -686,4 +684,4 @@ public String toString() {
         ", valueList=" + valueList +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypes_.java b/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypes_.java
index 673f76e02b..ff4238754a 100644
--- a/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypes_.java
+++ b/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypes_.java
@@ -105,8 +105,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public DataBindingModelWithAllFieldTypes_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<DataBindingModelWithAllFieldTypes_, DataBindingEpoxyModel.DataBindingHolder> listener) {
     onMutation();
@@ -128,8 +127,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public DataBindingModelWithAllFieldTypes_ onVisibilityChanged(
       OnModelVisibilityChangedListener<DataBindingModelWithAllFieldTypes_, DataBindingEpoxyModel.DataBindingHolder> listener) {
     onMutation();
@@ -677,35 +675,35 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
     long temp;
-    result = 31 * result + valueInt;
-    result = 31 * result + (valueInteger != null ? valueInteger.hashCode() : 0);
-    result = 31 * result + valueShort;
-    result = 31 * result + (valueShortWrapper != null ? valueShortWrapper.hashCode() : 0);
-    result = 31 * result + valueChar;
-    result = 31 * result + (valueCharacter != null ? valueCharacter.hashCode() : 0);
-    result = 31 * result + valuebByte;
-    result = 31 * result + (valueByteWrapper != null ? valueByteWrapper.hashCode() : 0);
-    result = 31 * result + (int) (valueLong ^ (valueLong >>> 32));
-    result = 31 * result + (valueLongWrapper != null ? valueLongWrapper.hashCode() : 0);
+    _result = 31 * _result + valueInt;
+    _result = 31 * _result + (valueInteger != null ? valueInteger.hashCode() : 0);
+    _result = 31 * _result + valueShort;
+    _result = 31 * _result + (valueShortWrapper != null ? valueShortWrapper.hashCode() : 0);
+    _result = 31 * _result + valueChar;
+    _result = 31 * _result + (valueCharacter != null ? valueCharacter.hashCode() : 0);
+    _result = 31 * _result + valuebByte;
+    _result = 31 * _result + (valueByteWrapper != null ? valueByteWrapper.hashCode() : 0);
+    _result = 31 * _result + (int) (valueLong ^ (valueLong >>> 32));
+    _result = 31 * _result + (valueLongWrapper != null ? valueLongWrapper.hashCode() : 0);
     temp = Double.doubleToLongBits(valueDouble);
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
-    result = 31 * result + (valueDoubleWrapper != null ? valueDoubleWrapper.hashCode() : 0);
-    result = 31 * result + (valueFloat != +0.0f ? Float.floatToIntBits(valueFloat) : 0);
-    result = 31 * result + (valueFloatWrapper != null ? valueFloatWrapper.hashCode() : 0);
-    result = 31 * result + (valueBoolean ? 1 : 0);
-    result = 31 * result + (valueBooleanWrapper != null ? valueBooleanWrapper.hashCode() : 0);
-    result = 31 * result + Arrays.hashCode(valueIntArray);
-    result = 31 * result + Arrays.hashCode(valueObjectArray);
-    result = 31 * result + (valueString != null ? valueString.hashCode() : 0);
-    result = 31 * result + (valueObject != null ? valueObject.hashCode() : 0);
-    result = 31 * result + (valueList != null ? valueList.hashCode() : 0);
-    return result;
+    _result = 31 * _result + (int) (temp ^ (temp >>> 32));
+    _result = 31 * _result + (valueDoubleWrapper != null ? valueDoubleWrapper.hashCode() : 0);
+    _result = 31 * _result + (valueFloat != +0.0f ? Float.floatToIntBits(valueFloat) : 0);
+    _result = 31 * _result + (valueFloatWrapper != null ? valueFloatWrapper.hashCode() : 0);
+    _result = 31 * _result + (valueBoolean ? 1 : 0);
+    _result = 31 * _result + (valueBooleanWrapper != null ? valueBooleanWrapper.hashCode() : 0);
+    _result = 31 * _result + Arrays.hashCode(valueIntArray);
+    _result = 31 * _result + Arrays.hashCode(valueObjectArray);
+    _result = 31 * _result + (valueString != null ? valueString.hashCode() : 0);
+    _result = 31 * _result + (valueObject != null ? valueObject.hashCode() : 0);
+    _result = 31 * _result + (valueList != null ? valueList.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -734,4 +732,4 @@ public String toString() {
         ", valueList=" + valueList +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/DefaultPackageLayoutPatternViewModel_.java b/epoxy-processortest/src/test/resources/DefaultPackageLayoutPatternViewModel_.java
index 0c9f473d6c..029e7aaeb9 100644
--- a/epoxy-processortest/src/test/resources/DefaultPackageLayoutPatternViewModel_.java
+++ b/epoxy-processortest/src/test/resources/DefaultPackageLayoutPatternViewModel_.java
@@ -107,8 +107,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public DefaultPackageLayoutPatternViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<DefaultPackageLayoutPatternViewModel_, DefaultPackageLayoutPatternView> listener) {
     onMutation();
@@ -130,8 +129,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public DefaultPackageLayoutPatternViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<DefaultPackageLayoutPatternViewModel_, DefaultPackageLayoutPatternView> listener) {
     onMutation();
@@ -253,12 +251,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -271,4 +269,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/DoNotHashViewModel_.java b/epoxy-processortest/src/test/resources/DoNotHashViewModel_.java
index dfe5f742af..4e63d086df 100644
--- a/epoxy-processortest/src/test/resources/DoNotHashViewModel_.java
+++ b/epoxy-processortest/src/test/resources/DoNotHashViewModel_.java
@@ -149,8 +149,7 @@ public void onVisibilityStateChanged(int visibilityState, final DoNotHashView ob
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public DoNotHashViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<DoNotHashViewModel_, DoNotHashView> listener) {
     onMutation();
@@ -172,8 +171,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public DoNotHashViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<DoNotHashViewModel_, DoNotHashView> listener) {
     onMutation();
@@ -380,15 +378,15 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_CharSequence != null ? 1 : 0);
-    result = 31 * result + (clickListener_OnClickListener != null ? 1 : 0);
-    result = 31 * result + (normalProp_CharSequence != null ? normalProp_CharSequence.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_CharSequence != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_OnClickListener != null ? 1 : 0);
+    _result = 31 * _result + (normalProp_CharSequence != null ? normalProp_CharSequence.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -404,4 +402,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/EpoxyModelGroupWithAnnotations_.java b/epoxy-processortest/src/test/resources/EpoxyModelGroupWithAnnotations_.java
index 8532283bf8..414b213079 100644
--- a/epoxy-processortest/src/test/resources/EpoxyModelGroupWithAnnotations_.java
+++ b/epoxy-processortest/src/test/resources/EpoxyModelGroupWithAnnotations_.java
@@ -245,13 +245,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$NoLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$NoLayout_.java
index e6fb8ce898..1d969c74fb 100644
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$NoLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$NoLayout_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodNextParentLayout$NoLayout_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GenerateDefaultLayoutMethodNextParentLayout$NoLayout_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodNextParentLayout$NoLayout_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GenerateDefaultLayoutMethodNextParentLayout$NoLayout_, Object> listener) {
     onMutation();
@@ -251,13 +249,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -266,4 +264,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_.java
index 92c7684563..876bbe72e1 100644
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_, Object> listener) {
     onMutation();
@@ -238,12 +236,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -251,4 +249,4 @@ public String toString() {
     return "GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_{" +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$WithLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$WithLayout_.java
index 921a36cf5d..8a99d6f3b4 100644
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$WithLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$WithLayout_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodNextParentLayout$WithLayout_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GenerateDefaultLayoutMethodNextParentLayout$WithLayout_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodNextParentLayout$WithLayout_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GenerateDefaultLayoutMethodNextParentLayout$WithLayout_, Object> listener) {
     onMutation();
@@ -237,12 +235,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -250,4 +248,4 @@ public String toString() {
     return "GenerateDefaultLayoutMethodNextParentLayout$WithLayout_{" +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$NoLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$NoLayout_.java
index 9cb9e1458a..dc281c0edc 100644
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$NoLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$NoLayout_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodParentLayout$NoLayout_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GenerateDefaultLayoutMethodParentLayout$NoLayout_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodParentLayout$NoLayout_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GenerateDefaultLayoutMethodParentLayout$NoLayout_, Object> listener) {
     onMutation();
@@ -251,13 +249,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -266,4 +264,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$WithLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$WithLayout_.java
index 474f0e0715..46a5c2bc0d 100644
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$WithLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$WithLayout_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodParentLayout$WithLayout_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GenerateDefaultLayoutMethodParentLayout$WithLayout_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethodParentLayout$WithLayout_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GenerateDefaultLayoutMethodParentLayout$WithLayout_, Object> listener) {
     onMutation();
@@ -237,12 +235,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -250,4 +248,4 @@ public String toString() {
     return "GenerateDefaultLayoutMethodParentLayout$WithLayout_{" +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethod_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethod_.java
index aae6daecdc..e25b428578 100644
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethod_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethod_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethod_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GenerateDefaultLayoutMethod_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GenerateDefaultLayoutMethod_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GenerateDefaultLayoutMethod_, Object> listener) {
     onMutation();
@@ -250,13 +248,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -265,4 +263,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/GeneratedModelSuffixViewSuffix_.java b/epoxy-processortest/src/test/resources/GeneratedModelSuffixViewSuffix_.java
index 4a9a7cb9ce..bde7c6d6ee 100644
--- a/epoxy-processortest/src/test/resources/GeneratedModelSuffixViewSuffix_.java
+++ b/epoxy-processortest/src/test/resources/GeneratedModelSuffixViewSuffix_.java
@@ -106,8 +106,7 @@ public void onVisibilityStateChanged(int visibilityState, final GeneratedModelSu
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GeneratedModelSuffixViewSuffix_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GeneratedModelSuffixViewSuffix_, GeneratedModelSuffixView> listener) {
     onMutation();
@@ -129,8 +128,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GeneratedModelSuffixViewSuffix_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GeneratedModelSuffixViewSuffix_, GeneratedModelSuffixView> listener) {
     onMutation();
@@ -252,12 +250,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -270,4 +268,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/GridSpanCountViewModel_.java b/epoxy-processortest/src/test/resources/GridSpanCountViewModel_.java
index d6b3be72d4..29f33e61fe 100644
--- a/epoxy-processortest/src/test/resources/GridSpanCountViewModel_.java
+++ b/epoxy-processortest/src/test/resources/GridSpanCountViewModel_.java
@@ -122,8 +122,7 @@ public void onVisibilityStateChanged(int visibilityState, final GridSpanCountVie
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GridSpanCountViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<GridSpanCountViewModel_, GridSpanCountView> listener) {
     onMutation();
@@ -145,8 +144,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public GridSpanCountViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<GridSpanCountViewModel_, GridSpanCountView> listener) {
     onMutation();
@@ -291,13 +289,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -306,4 +304,4 @@ public String toString() {
         "clickListener_String=" + clickListener_String +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/IgnoreRequireHashCodeViewModel_.java b/epoxy-processortest/src/test/resources/IgnoreRequireHashCodeViewModel_.java
index 5b6cf52d10..0541fd1269 100644
--- a/epoxy-processortest/src/test/resources/IgnoreRequireHashCodeViewModel_.java
+++ b/epoxy-processortest/src/test/resources/IgnoreRequireHashCodeViewModel_.java
@@ -124,8 +124,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public IgnoreRequireHashCodeViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<IgnoreRequireHashCodeViewModel_, IgnoreRequireHashCodeView> listener) {
     onMutation();
@@ -147,8 +146,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public IgnoreRequireHashCodeViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<IgnoreRequireHashCodeViewModel_, IgnoreRequireHashCodeView> listener) {
     onMutation();
@@ -310,13 +308,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener_OnClickListener != null ? clickListener_OnClickListener.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_OnClickListener != null ? clickListener_OnClickListener.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -330,4 +328,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/LayoutOverloadsViewModel_.java b/epoxy-processortest/src/test/resources/LayoutOverloadsViewModel_.java
index 0e05191673..021eaf28e0 100644
--- a/epoxy-processortest/src/test/resources/LayoutOverloadsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/LayoutOverloadsViewModel_.java
@@ -106,8 +106,7 @@ public void onVisibilityStateChanged(int visibilityState, final LayoutOverloadsV
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public LayoutOverloadsViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<LayoutOverloadsViewModel_, LayoutOverloadsView> listener) {
     onMutation();
@@ -129,8 +128,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public LayoutOverloadsViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<LayoutOverloadsViewModel_, LayoutOverloadsView> listener) {
     onMutation();
@@ -261,12 +259,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -279,4 +277,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelDoNotHash_.java b/epoxy-processortest/src/test/resources/ModelDoNotHash_.java
index b80bdec186..1cf7b246d3 100644
--- a/epoxy-processortest/src/test/resources/ModelDoNotHash_.java
+++ b/epoxy-processortest/src/test/resources/ModelDoNotHash_.java
@@ -89,8 +89,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelDoNotHash_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelDoNotHash_, Object> listener) {
     onMutation();
@@ -112,8 +111,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelDoNotHash_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelDoNotHash_, Object> listener) {
     onMutation();
@@ -265,14 +263,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    result = 31 * result + (value3 != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    _result = 31 * _result + (value3 != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -283,4 +281,4 @@ public String toString() {
         ", value3=" + value3 +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelDoNotUseInToString_.java b/epoxy-processortest/src/test/resources/ModelDoNotUseInToString_.java
index d67112d447..f524502679 100644
--- a/epoxy-processortest/src/test/resources/ModelDoNotUseInToString_.java
+++ b/epoxy-processortest/src/test/resources/ModelDoNotUseInToString_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelDoNotUseInToString_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelDoNotUseInToString_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelDoNotUseInToString_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelDoNotUseInToString_, Object> listener) {
     onMutation();
@@ -271,15 +269,15 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    result = 31 * result + value2;
-    result = 31 * result + (value3 != null ? value3.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    _result = 31 * _result + value2;
+    _result = 31 * _result + (value3 != null ? value3.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -288,4 +286,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelForRProcessingTest_.java b/epoxy-processortest/src/test/resources/ModelForRProcessingTest_.java
index 8d263675ec..dda05afe0c 100644
--- a/epoxy-processortest/src/test/resources/ModelForRProcessingTest_.java
+++ b/epoxy-processortest/src/test/resources/ModelForRProcessingTest_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelForRProcessingTest_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelForRProcessingTest_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelForRProcessingTest_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelForRProcessingTest_, Object> listener) {
     onMutation();
@@ -249,13 +247,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -264,4 +262,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelForTestingDuplicateRValues_.java b/epoxy-processortest/src/test/resources/ModelForTestingDuplicateRValues_.java
index 5db72fa508..212da6b3c4 100644
--- a/epoxy-processortest/src/test/resources/ModelForTestingDuplicateRValues_.java
+++ b/epoxy-processortest/src/test/resources/ModelForTestingDuplicateRValues_.java
@@ -92,8 +92,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelForTestingDuplicateRValues_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelForTestingDuplicateRValues_, Object> listener) {
     onMutation();
@@ -115,8 +114,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelForTestingDuplicateRValues_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelForTestingDuplicateRValues_, Object> listener) {
     onMutation();
@@ -251,13 +249,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -266,4 +264,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelNoValidation_.java b/epoxy-processortest/src/test/resources/ModelNoValidation_.java
index 7fff4702dd..271b9b5fea 100644
--- a/epoxy-processortest/src/test/resources/ModelNoValidation_.java
+++ b/epoxy-processortest/src/test/resources/ModelNoValidation_.java
@@ -81,8 +81,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelNoValidation_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelNoValidation_, Object> listener) {
     onMutation();
@@ -104,8 +103,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelNoValidation_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelNoValidation_, Object> listener) {
     onMutation();
@@ -232,13 +230,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -247,4 +245,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelReturningClassTypeWithVarargs_.java b/epoxy-processortest/src/test/resources/ModelReturningClassTypeWithVarargs_.java
index f6282d3b8e..05e441f394 100644
--- a/epoxy-processortest/src/test/resources/ModelReturningClassTypeWithVarargs_.java
+++ b/epoxy-processortest/src/test/resources/ModelReturningClassTypeWithVarargs_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelReturningClassTypeWithVarargs_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelReturningClassTypeWithVarargs_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelReturningClassTypeWithVarargs_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelReturningClassTypeWithVarargs_, Object> listener) {
     onMutation();
@@ -256,13 +254,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -271,4 +269,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelReturningClassType_.java b/epoxy-processortest/src/test/resources/ModelReturningClassType_.java
index 55678c7a3d..2dccd82c40 100644
--- a/epoxy-processortest/src/test/resources/ModelReturningClassType_.java
+++ b/epoxy-processortest/src/test/resources/ModelReturningClassType_.java
@@ -92,8 +92,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelReturningClassType_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelReturningClassType_, Object> listener) {
     onMutation();
@@ -115,8 +114,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelReturningClassType_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelReturningClassType_, Object> listener) {
     onMutation();
@@ -262,13 +260,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -277,4 +275,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelViewExtendingSuperClassModel_.java b/epoxy-processortest/src/test/resources/ModelViewExtendingSuperClassModel_.java
index 78b16911ae..cd7893c606 100644
--- a/epoxy-processortest/src/test/resources/ModelViewExtendingSuperClassModel_.java
+++ b/epoxy-processortest/src/test/resources/ModelViewExtendingSuperClassModel_.java
@@ -143,8 +143,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelViewExtendingSuperClassModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelViewExtendingSuperClassModel_, ModelViewExtendingSuperClass> listener) {
     onMutation();
@@ -166,8 +165,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelViewExtendingSuperClassModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelViewExtendingSuperClassModel_, ModelViewExtendingSuperClass> listener) {
     onMutation();
@@ -328,14 +326,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + subClassValue_Int;
-    result = 31 * result + superClassValue_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + subClassValue_Int;
+    _result = 31 * _result + superClassValue_Int;
+    return _result;
   }
 
   @Override
@@ -350,4 +348,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelViewSuperClassModel_.java b/epoxy-processortest/src/test/resources/ModelViewSuperClassModel_.java
index e3a0743e00..9c15f044c1 100644
--- a/epoxy-processortest/src/test/resources/ModelViewSuperClassModel_.java
+++ b/epoxy-processortest/src/test/resources/ModelViewSuperClassModel_.java
@@ -131,8 +131,7 @@ public void onVisibilityStateChanged(int visibilityState, final ModelViewSuperCl
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelViewSuperClassModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelViewSuperClassModel_, ModelViewSuperClass> listener) {
     onMutation();
@@ -154,8 +153,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelViewSuperClassModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelViewSuperClassModel_, ModelViewSuperClass> listener) {
     onMutation();
@@ -295,13 +293,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + superClassValue_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + superClassValue_Int;
+    return _result;
   }
 
   @Override
@@ -315,4 +313,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelViewWithParisModel_.java b/epoxy-processortest/src/test/resources/ModelViewWithParisModel_.java
index f946b50292..2f33349f82 100644
--- a/epoxy-processortest/src/test/resources/ModelViewWithParisModel_.java
+++ b/epoxy-processortest/src/test/resources/ModelViewWithParisModel_.java
@@ -174,8 +174,7 @@ public void onVisibilityStateChanged(int visibilityState, final ModelViewWithPar
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelViewWithParisModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelViewWithParisModel_, ModelViewWithParis> listener) {
     onMutation();
@@ -197,8 +196,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelViewWithParisModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelViewWithParisModel_, ModelViewWithParis> listener) {
     onMutation();
@@ -221,7 +219,8 @@ public ModelViewWithParisModel_ styleBuilder(
   }
 
   /**
-   *  @see ModelViewWithParis#headerStyle(ModelViewWithParisStyleApplier.StyleBuilder)  */
+   *  @see ModelViewWithParis#headerStyle(ModelViewWithParisStyleApplier.StyleBuilder)
+   */
   public ModelViewWithParisModel_ withHeaderStyle() {
     Style style = parisStyleReference_header != null ? parisStyleReference_header.get() : null;
     if (style == null) {
@@ -232,7 +231,8 @@ public ModelViewWithParisModel_ withHeaderStyle() {
   }
 
   /**
-   *  @see ModelViewWithParis#otherStyle(ModelViewWithParisStyleApplier.StyleBuilder)  */
+   *  @see ModelViewWithParis#otherStyle(ModelViewWithParisStyleApplier.StyleBuilder)
+   */
   public ModelViewWithParisModel_ withOtherStyle() {
     Style style = parisStyleReference_other != null ? parisStyleReference_other.get() : null;
     if (style == null) {
@@ -243,7 +243,8 @@ public ModelViewWithParisModel_ withOtherStyle() {
   }
 
   /**
-   *  @see ModelViewWithParis#headerStyle(ModelViewWithParisStyleApplier.StyleBuilder)  */
+   *  @see ModelViewWithParis#headerStyle(ModelViewWithParisStyleApplier.StyleBuilder)
+   */
   public ModelViewWithParisModel_ withDefaultStyle() {
     Style style = parisStyleReference_default != null ? parisStyleReference_default.get() : null;
     if (style == null) {
@@ -389,14 +390,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value_Int;
-    result = 31 * result + (style != null ? style.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value_Int;
+    _result = 31 * _result + (style != null ? style.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -411,4 +412,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithAbstractClassAndAnnotation_.java b/epoxy-processortest/src/test/resources/ModelWithAbstractClassAndAnnotation_.java
index 55acde68b3..526e0ecb04 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAbstractClassAndAnnotation_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAbstractClassAndAnnotation_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAbstractClassAndAnnotation_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithAbstractClassAndAnnotation_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAbstractClassAndAnnotation_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithAbstractClassAndAnnotation_, Object> listener) {
     onMutation();
@@ -230,12 +228,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -243,4 +241,4 @@ public String toString() {
     return "ModelWithAbstractClassAndAnnotation_{" +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithAllFieldTypes_.java b/epoxy-processortest/src/test/resources/ModelWithAllFieldTypes_.java
index 4dc5718b4a..152d72b718 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAllFieldTypes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAllFieldTypes_.java
@@ -101,8 +101,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAllFieldTypes_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithAllFieldTypes_, Object> listener) {
     onMutation();
@@ -124,8 +123,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAllFieldTypes_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithAllFieldTypes_, Object> listener) {
     onMutation();
@@ -533,35 +531,35 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
     long temp;
-    result = 31 * result + valueInt;
-    result = 31 * result + (valueInteger != null ? valueInteger.hashCode() : 0);
-    result = 31 * result + valueShort;
-    result = 31 * result + (valueShortWrapper != null ? valueShortWrapper.hashCode() : 0);
-    result = 31 * result + valueChar;
-    result = 31 * result + (valueCharacter != null ? valueCharacter.hashCode() : 0);
-    result = 31 * result + valuebByte;
-    result = 31 * result + (valueByteWrapper != null ? valueByteWrapper.hashCode() : 0);
-    result = 31 * result + (int) (valueLong ^ (valueLong >>> 32));
-    result = 31 * result + (valueLongWrapper != null ? valueLongWrapper.hashCode() : 0);
+    _result = 31 * _result + valueInt;
+    _result = 31 * _result + (valueInteger != null ? valueInteger.hashCode() : 0);
+    _result = 31 * _result + valueShort;
+    _result = 31 * _result + (valueShortWrapper != null ? valueShortWrapper.hashCode() : 0);
+    _result = 31 * _result + valueChar;
+    _result = 31 * _result + (valueCharacter != null ? valueCharacter.hashCode() : 0);
+    _result = 31 * _result + valuebByte;
+    _result = 31 * _result + (valueByteWrapper != null ? valueByteWrapper.hashCode() : 0);
+    _result = 31 * _result + (int) (valueLong ^ (valueLong >>> 32));
+    _result = 31 * _result + (valueLongWrapper != null ? valueLongWrapper.hashCode() : 0);
     temp = Double.doubleToLongBits(valueDouble);
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
-    result = 31 * result + (valueDoubleWrapper != null ? valueDoubleWrapper.hashCode() : 0);
-    result = 31 * result + (valueFloat != +0.0f ? Float.floatToIntBits(valueFloat) : 0);
-    result = 31 * result + (valueFloatWrapper != null ? valueFloatWrapper.hashCode() : 0);
-    result = 31 * result + (valueBoolean ? 1 : 0);
-    result = 31 * result + (valueBooleanWrapper != null ? valueBooleanWrapper.hashCode() : 0);
-    result = 31 * result + Arrays.hashCode(valueIntArray);
-    result = 31 * result + Arrays.hashCode(valueObjectArray);
-    result = 31 * result + (valueString != null ? valueString.hashCode() : 0);
-    result = 31 * result + (valueObject != null ? valueObject.hashCode() : 0);
-    result = 31 * result + (valueList != null ? valueList.hashCode() : 0);
-    return result;
+    _result = 31 * _result + (int) (temp ^ (temp >>> 32));
+    _result = 31 * _result + (valueDoubleWrapper != null ? valueDoubleWrapper.hashCode() : 0);
+    _result = 31 * _result + (valueFloat != +0.0f ? Float.floatToIntBits(valueFloat) : 0);
+    _result = 31 * _result + (valueFloatWrapper != null ? valueFloatWrapper.hashCode() : 0);
+    _result = 31 * _result + (valueBoolean ? 1 : 0);
+    _result = 31 * _result + (valueBooleanWrapper != null ? valueBooleanWrapper.hashCode() : 0);
+    _result = 31 * _result + Arrays.hashCode(valueIntArray);
+    _result = 31 * _result + Arrays.hashCode(valueObjectArray);
+    _result = 31 * _result + (valueString != null ? valueString.hashCode() : 0);
+    _result = 31 * _result + (valueObject != null ? valueObject.hashCode() : 0);
+    _result = 31 * _result + (valueList != null ? valueList.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -590,4 +588,4 @@ public String toString() {
         ", valueList=" + valueList +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithAllPrivateFieldTypes_.java b/epoxy-processortest/src/test/resources/ModelWithAllPrivateFieldTypes_.java
index ee19f81118..f4fe1734f0 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAllPrivateFieldTypes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAllPrivateFieldTypes_.java
@@ -101,8 +101,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAllPrivateFieldTypes_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithAllPrivateFieldTypes_, Object> listener) {
     onMutation();
@@ -124,8 +123,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAllPrivateFieldTypes_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithAllPrivateFieldTypes_, Object> listener) {
     onMutation();
@@ -540,35 +538,35 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
     long temp;
-    result = 31 * result + getValueInt();
-    result = 31 * result + (getValueInteger() != null ? getValueInteger().hashCode() : 0);
-    result = 31 * result + getValueShort();
-    result = 31 * result + (getValueShortWrapper() != null ? getValueShortWrapper().hashCode() : 0);
-    result = 31 * result + getValueChar();
-    result = 31 * result + (getValueCharacter() != null ? getValueCharacter().hashCode() : 0);
-    result = 31 * result + getValuebByte();
-    result = 31 * result + (getValueByteWrapper() != null ? getValueByteWrapper().hashCode() : 0);
-    result = 31 * result + (int) (getValueLong() ^ (getValueLong() >>> 32));
-    result = 31 * result + (getValueLongWrapper() != null ? getValueLongWrapper().hashCode() : 0);
+    _result = 31 * _result + getValueInt();
+    _result = 31 * _result + (getValueInteger() != null ? getValueInteger().hashCode() : 0);
+    _result = 31 * _result + getValueShort();
+    _result = 31 * _result + (getValueShortWrapper() != null ? getValueShortWrapper().hashCode() : 0);
+    _result = 31 * _result + getValueChar();
+    _result = 31 * _result + (getValueCharacter() != null ? getValueCharacter().hashCode() : 0);
+    _result = 31 * _result + getValuebByte();
+    _result = 31 * _result + (getValueByteWrapper() != null ? getValueByteWrapper().hashCode() : 0);
+    _result = 31 * _result + (int) (getValueLong() ^ (getValueLong() >>> 32));
+    _result = 31 * _result + (getValueLongWrapper() != null ? getValueLongWrapper().hashCode() : 0);
     temp = Double.doubleToLongBits(getValueDouble());
-    result = 31 * result + (int) (temp ^ (temp >>> 32));
-    result = 31 * result + (getValueDoubleWrapper() != null ? getValueDoubleWrapper().hashCode() : 0);
-    result = 31 * result + (getValueFloat() != +0.0f ? Float.floatToIntBits(getValueFloat()) : 0);
-    result = 31 * result + (getValueFloatWrapper() != null ? getValueFloatWrapper().hashCode() : 0);
-    result = 31 * result + (isValueBoolean() ? 1 : 0);
-    result = 31 * result + (getValueBooleanWrapper() != null ? getValueBooleanWrapper().hashCode() : 0);
-    result = 31 * result + Arrays.hashCode(getValueIntArray());
-    result = 31 * result + Arrays.hashCode(getValueObjectArray());
-    result = 31 * result + (getValueString() != null ? getValueString().hashCode() : 0);
-    result = 31 * result + (getValueObject() != null ? getValueObject().hashCode() : 0);
-    result = 31 * result + (getValueList() != null ? getValueList().hashCode() : 0);
-    return result;
+    _result = 31 * _result + (int) (temp ^ (temp >>> 32));
+    _result = 31 * _result + (getValueDoubleWrapper() != null ? getValueDoubleWrapper().hashCode() : 0);
+    _result = 31 * _result + (getValueFloat() != +0.0f ? Float.floatToIntBits(getValueFloat()) : 0);
+    _result = 31 * _result + (getValueFloatWrapper() != null ? getValueFloatWrapper().hashCode() : 0);
+    _result = 31 * _result + (isValueBoolean() ? 1 : 0);
+    _result = 31 * _result + (getValueBooleanWrapper() != null ? getValueBooleanWrapper().hashCode() : 0);
+    _result = 31 * _result + Arrays.hashCode(getValueIntArray());
+    _result = 31 * _result + Arrays.hashCode(getValueObjectArray());
+    _result = 31 * _result + (getValueString() != null ? getValueString().hashCode() : 0);
+    _result = 31 * _result + (getValueObject() != null ? getValueObject().hashCode() : 0);
+    _result = 31 * _result + (getValueList() != null ? getValueList().hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -597,4 +595,4 @@ public String toString() {
         ", valueList=" + getValueList() +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_.java b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_.java
index e7a7092633..1eb02dcdf2 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_, Object> listener) {
     onMutation();
@@ -255,13 +253,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + superValue;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + superValue;
+    return _result;
   }
 
   @Override
@@ -270,4 +268,4 @@ public String toString() {
         "superValue=" + superValue +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes_.java b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes_.java
index 3897b72a40..9c4182aed2 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAnnotatedClassAndSuperAttributes_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithAnnotatedClassAndSuperAttributes_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAnnotatedClassAndSuperAttributes_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithAnnotatedClassAndSuperAttributes_, Object> listener) {
     onMutation();
@@ -244,13 +242,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + superValue;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + superValue;
+    return _result;
   }
 
   @Override
@@ -259,4 +257,4 @@ public String toString() {
         "superValue=" + superValue +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClass_.java b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClass_.java
index 8284b0a6b6..7726fdbc7f 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClass_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClass_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAnnotatedClass_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithAnnotatedClass_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAnnotatedClass_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithAnnotatedClass_, Object> listener) {
     onMutation();
@@ -229,12 +227,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -242,4 +240,4 @@ public String toString() {
     return "ModelWithAnnotatedClass_{" +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithAnnotation_.java b/epoxy-processortest/src/test/resources/ModelWithAnnotation_.java
index d8b4dcff71..f295cba87f 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAnnotation_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAnnotation_.java
@@ -92,8 +92,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAnnotation_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithAnnotation_, Object> listener) {
     onMutation();
@@ -115,8 +114,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithAnnotation_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithAnnotation_, Object> listener) {
     onMutation();
@@ -229,12 +227,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -242,4 +240,4 @@ public String toString() {
     return "ModelWithAnnotation_{" +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithCheckedChangeListener_.java b/epoxy-processortest/src/test/resources/ModelWithCheckedChangeListener_.java
index 325da4bc41..eb606feb34 100644
--- a/epoxy-processortest/src/test/resources/ModelWithCheckedChangeListener_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithCheckedChangeListener_.java
@@ -258,13 +258,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (checkedListener != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (checkedListener != null ? 1 : 0);
+    return _result;
   }
 
   @Override
diff --git a/epoxy-processortest/src/test/resources/ModelWithConstructors_.java b/epoxy-processortest/src/test/resources/ModelWithConstructors_.java
index a21129fce6..d940d07c72 100644
--- a/epoxy-processortest/src/test/resources/ModelWithConstructors_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithConstructors_.java
@@ -99,8 +99,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithConstructors_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithConstructors_, Object> listener) {
     onMutation();
@@ -122,8 +121,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithConstructors_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithConstructors_, Object> listener) {
     onMutation();
@@ -251,13 +249,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + valueInt;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + valueInt;
+    return _result;
   }
 
   @Override
@@ -266,4 +264,4 @@ public String toString() {
         "valueInt=" + valueInt +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithDataBindingBindingModel_.java b/epoxy-processortest/src/test/resources/ModelWithDataBindingBindingModel_.java
index 4c3f2a35f7..4ed00a1d5e 100644
--- a/epoxy-processortest/src/test/resources/ModelWithDataBindingBindingModel_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithDataBindingBindingModel_.java
@@ -93,8 +93,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithDataBindingBindingModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithDataBindingBindingModel_, DataBindingEpoxyModel.DataBindingHolder> listener) {
     onMutation();
@@ -116,8 +115,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithDataBindingBindingModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithDataBindingBindingModel_, DataBindingEpoxyModel.DataBindingHolder> listener) {
     onMutation();
@@ -271,13 +269,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (stringValue != null ? stringValue.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (stringValue != null ? stringValue.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -286,4 +284,4 @@ public String toString() {
         "stringValue=" + stringValue +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithDataBindingWithoutDonothashBindingModel_.java b/epoxy-processortest/src/test/resources/ModelWithDataBindingWithoutDonothashBindingModel_.java
index a2fa149847..1378b1f3cd 100644
--- a/epoxy-processortest/src/test/resources/ModelWithDataBindingWithoutDonothashBindingModel_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithDataBindingWithoutDonothashBindingModel_.java
@@ -96,8 +96,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithDataBindingWithoutDonothashBindingModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithDataBindingWithoutDonothashBindingModel_, DataBindingEpoxyModel.DataBindingHolder> listener) {
     onMutation();
@@ -119,8 +118,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithDataBindingWithoutDonothashBindingModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithDataBindingWithoutDonothashBindingModel_, DataBindingEpoxyModel.DataBindingHolder> listener) {
     onMutation();
@@ -310,14 +308,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (stringValue != null ? stringValue.hashCode() : 0);
-    result = 31 * result + (clickListener != null ? clickListener.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (stringValue != null ? stringValue.hashCode() : 0);
+    _result = 31 * _result + (clickListener != null ? clickListener.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -327,4 +325,4 @@ public String toString() {
         ", clickListener=" + clickListener +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithFieldAnnotation_.java b/epoxy-processortest/src/test/resources/ModelWithFieldAnnotation_.java
index 59b81bbb91..c036bd0332 100644
--- a/epoxy-processortest/src/test/resources/ModelWithFieldAnnotation_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithFieldAnnotation_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithFieldAnnotation_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithFieldAnnotation_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithFieldAnnotation_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithFieldAnnotation_, Object> listener) {
     onMutation();
@@ -244,13 +242,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title != null ? title.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title != null ? title.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -259,4 +257,4 @@ public String toString() {
         "title=" + title +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithFinalField_.java b/epoxy-processortest/src/test/resources/ModelWithFinalField_.java
index 6c94cb5dbf..3ab60b59a2 100644
--- a/epoxy-processortest/src/test/resources/ModelWithFinalField_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithFinalField_.java
@@ -90,8 +90,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithFinalField_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithFinalField_, Object> listener) {
     onMutation();
@@ -113,8 +112,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithFinalField_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithFinalField_, Object> listener) {
     onMutation();
@@ -234,13 +232,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + valueInt;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + valueInt;
+    return _result;
   }
 
   @Override
@@ -249,4 +247,4 @@ public String toString() {
         "valueInt=" + valueInt +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithIntDef_.java b/epoxy-processortest/src/test/resources/ModelWithIntDef_.java
index cfaef866ec..13b08378c7 100644
--- a/epoxy-processortest/src/test/resources/ModelWithIntDef_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithIntDef_.java
@@ -97,8 +97,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithIntDef_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithIntDef_, Object> listener) {
     onMutation();
@@ -120,8 +119,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithIntDef_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithIntDef_, Object> listener) {
     onMutation();
@@ -249,13 +247,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + type;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + type;
+    return _result;
   }
 
   @Override
@@ -264,4 +262,4 @@ public String toString() {
         "type=" + type +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_.java b/epoxy-processortest/src/test/resources/ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_.java
index 103985cc8e..427198b868 100644
--- a/epoxy-processortest/src/test/resources/ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_, Object> listener) {
     onMutation();
@@ -245,13 +243,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (isValue() ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (isValue() ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -260,4 +258,4 @@ public String toString() {
         "isValue=" + isValue() +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithPrivateViewClickListener_.java b/epoxy-processortest/src/test/resources/ModelWithPrivateViewClickListener_.java
index df4dde4457..4b2771fc26 100644
--- a/epoxy-processortest/src/test/resources/ModelWithPrivateViewClickListener_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithPrivateViewClickListener_.java
@@ -92,8 +92,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithPrivateViewClickListener_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithPrivateViewClickListener_, Object> listener) {
     onMutation();
@@ -115,8 +114,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithPrivateViewClickListener_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithPrivateViewClickListener_, Object> listener) {
     onMutation();
@@ -259,13 +257,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (getClickListener() != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (getClickListener() != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -274,4 +272,4 @@ public String toString() {
         "clickListener=" + getClickListener() +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithSuperAttributes$SubModelWithSuperAttributes_.java b/epoxy-processortest/src/test/resources/ModelWithSuperAttributes$SubModelWithSuperAttributes_.java
index e305bd1d93..6838c92cbf 100644
--- a/epoxy-processortest/src/test/resources/ModelWithSuperAttributes$SubModelWithSuperAttributes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithSuperAttributes$SubModelWithSuperAttributes_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithSuperAttributes$SubModelWithSuperAttributes_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithSuperAttributes$SubModelWithSuperAttributes_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithSuperAttributes$SubModelWithSuperAttributes_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithSuperAttributes$SubModelWithSuperAttributes_, Object> listener) {
     onMutation();
@@ -259,14 +257,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + subValue;
-    result = 31 * result + superValue;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + subValue;
+    _result = 31 * _result + superValue;
+    return _result;
   }
 
   @Override
@@ -276,4 +274,4 @@ public String toString() {
         ", superValue=" + superValue +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithSuperAttributes_.java b/epoxy-processortest/src/test/resources/ModelWithSuperAttributes_.java
index 80b4f8ac12..828a5882b1 100644
--- a/epoxy-processortest/src/test/resources/ModelWithSuperAttributes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithSuperAttributes_.java
@@ -91,8 +91,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithSuperAttributes_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithSuperAttributes_, Object> listener) {
     onMutation();
@@ -114,8 +113,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithSuperAttributes_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithSuperAttributes_, Object> listener) {
     onMutation();
@@ -243,13 +241,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + superValue;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + superValue;
+    return _result;
   }
 
   @Override
@@ -258,4 +256,4 @@ public String toString() {
         "superValue=" + superValue +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithSuper_.java b/epoxy-processortest/src/test/resources/ModelWithSuper_.java
index 1b703c1791..f0a5d943e6 100644
--- a/epoxy-processortest/src/test/resources/ModelWithSuper_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithSuper_.java
@@ -89,8 +89,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithSuper_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithSuper_, Object> listener) {
     onMutation();
@@ -112,8 +111,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithSuper_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithSuper_, Object> listener) {
     onMutation();
@@ -241,13 +239,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + valueInt;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + valueInt;
+    return _result;
   }
 
   @Override
@@ -256,4 +254,4 @@ public String toString() {
         "valueInt=" + valueInt +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithType_.java b/epoxy-processortest/src/test/resources/ModelWithType_.java
index a69ca6b570..fb7aabb53b 100644
--- a/epoxy-processortest/src/test/resources/ModelWithType_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithType_.java
@@ -89,8 +89,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithType_<T> onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithType_<T>, Object> listener) {
     onMutation();
@@ -112,8 +111,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithType_<T> onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithType_<T>, Object> listener) {
     onMutation();
@@ -240,13 +238,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -255,4 +253,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithVarargsConstructors_.java b/epoxy-processortest/src/test/resources/ModelWithVarargsConstructors_.java
index aaeebd694b..94cb99c0bf 100644
--- a/epoxy-processortest/src/test/resources/ModelWithVarargsConstructors_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithVarargsConstructors_.java
@@ -96,8 +96,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithVarargsConstructors_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithVarargsConstructors_, Object> listener) {
     onMutation();
@@ -119,8 +118,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithVarargsConstructors_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithVarargsConstructors_, Object> listener) {
     onMutation();
@@ -263,14 +261,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + valueInt;
-    result = 31 * result + Arrays.hashCode(varargs);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + valueInt;
+    _result = 31 * _result + Arrays.hashCode(varargs);
+    return _result;
   }
 
   @Override
@@ -280,4 +278,4 @@ public String toString() {
         ", varargs=" + varargs +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithViewClickListener_.java b/epoxy-processortest/src/test/resources/ModelWithViewClickListener_.java
index 2ee04cd082..fa5c2ccb57 100644
--- a/epoxy-processortest/src/test/resources/ModelWithViewClickListener_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithViewClickListener_.java
@@ -92,8 +92,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithViewClickListener_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithViewClickListener_, Object> listener) {
     onMutation();
@@ -115,8 +114,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithViewClickListener_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithViewClickListener_, Object> listener) {
     onMutation();
@@ -259,13 +257,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener != null ? 1 : 0);
+    return _result;
   }
 
   @Override
diff --git a/epoxy-processortest/src/test/resources/ModelWithViewLongClickListener_.java b/epoxy-processortest/src/test/resources/ModelWithViewLongClickListener_.java
index d7027963b0..afc6bc25c1 100644
--- a/epoxy-processortest/src/test/resources/ModelWithViewLongClickListener_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithViewLongClickListener_.java
@@ -92,8 +92,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithViewLongClickListener_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithViewLongClickListener_, Object> listener) {
     onMutation();
@@ -115,8 +114,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithViewLongClickListener_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithViewLongClickListener_, Object> listener) {
     onMutation();
@@ -259,13 +257,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener != null ? 1 : 0);
+    return _result;
   }
 
   @Override
diff --git a/epoxy-processortest/src/test/resources/ModelWithoutHash_.java b/epoxy-processortest/src/test/resources/ModelWithoutHash_.java
index 650e5faecb..f506e7ea91 100644
--- a/epoxy-processortest/src/test/resources/ModelWithoutHash_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithoutHash_.java
@@ -89,8 +89,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithoutHash_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithoutHash_, Object> listener) {
     onMutation();
@@ -112,8 +111,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithoutHash_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithoutHash_, Object> listener) {
     onMutation();
@@ -265,14 +263,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    result = 31 * result + (value3 != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    _result = 31 * _result + (value3 != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -283,4 +281,4 @@ public String toString() {
         ", value3=" + value3 +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/ModelWithoutSetter_.java b/epoxy-processortest/src/test/resources/ModelWithoutSetter_.java
index 75a501963c..870e7d06dc 100644
--- a/epoxy-processortest/src/test/resources/ModelWithoutSetter_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithoutSetter_.java
@@ -90,8 +90,7 @@ public void onVisibilityStateChanged(int visibilityState, final Object object) {
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithoutSetter_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<ModelWithoutSetter_, Object> listener) {
     onMutation();
@@ -113,8 +112,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public ModelWithoutSetter_ onVisibilityChanged(
       OnModelVisibilityChangedListener<ModelWithoutSetter_, Object> listener) {
     onMutation();
@@ -235,13 +233,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value;
+    return _result;
   }
 
   @Override
@@ -250,4 +248,4 @@ public String toString() {
         "value=" + value +
         "}" + super.toString();
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/NullOnRecycleViewModel_.java b/epoxy-processortest/src/test/resources/NullOnRecycleViewModel_.java
index ea6df5f438..75683dabc3 100644
--- a/epoxy-processortest/src/test/resources/NullOnRecycleViewModel_.java
+++ b/epoxy-processortest/src/test/resources/NullOnRecycleViewModel_.java
@@ -117,8 +117,7 @@ public void onVisibilityStateChanged(int visibilityState, final NullOnRecycleVie
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public NullOnRecycleViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<NullOnRecycleViewModel_, NullOnRecycleView> listener) {
     onMutation();
@@ -140,8 +139,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public NullOnRecycleViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<NullOnRecycleViewModel_, NullOnRecycleView> listener) {
     onMutation();
@@ -283,13 +281,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_CharSequence != null ? title_CharSequence.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_CharSequence != null ? title_CharSequence.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -303,4 +301,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/OnViewRecycledViewModel_.java b/epoxy-processortest/src/test/resources/OnViewRecycledViewModel_.java
index 3d9ebcd5fb..29a0d4592b 100644
--- a/epoxy-processortest/src/test/resources/OnViewRecycledViewModel_.java
+++ b/epoxy-processortest/src/test/resources/OnViewRecycledViewModel_.java
@@ -124,8 +124,7 @@ public void onVisibilityStateChanged(int visibilityState, final OnViewRecycledVi
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public OnViewRecycledViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<OnViewRecycledViewModel_, OnViewRecycledView> listener) {
     onMutation();
@@ -147,8 +146,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public OnViewRecycledViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<OnViewRecycledViewModel_, OnViewRecycledView> listener) {
     onMutation();
@@ -293,13 +291,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_CharSequence != null ? title_CharSequence.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_CharSequence != null ? title_CharSequence.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -313,4 +311,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/OnVisibilityChangedViewModel_.java b/epoxy-processortest/src/test/resources/OnVisibilityChangedViewModel_.java
index dc96e3a8cb..50ed7c96d5 100644
--- a/epoxy-processortest/src/test/resources/OnVisibilityChangedViewModel_.java
+++ b/epoxy-processortest/src/test/resources/OnVisibilityChangedViewModel_.java
@@ -292,13 +292,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_CharSequence != null ? title_CharSequence.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_CharSequence != null ? title_CharSequence.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -312,4 +312,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/OnVisibilityStateChangedViewModel_.java b/epoxy-processortest/src/test/resources/OnVisibilityStateChangedViewModel_.java
index 8904c103d8..f91a63ef2c 100644
--- a/epoxy-processortest/src/test/resources/OnVisibilityStateChangedViewModel_.java
+++ b/epoxy-processortest/src/test/resources/OnVisibilityStateChangedViewModel_.java
@@ -110,7 +110,8 @@ public OnVisibilityStateChangedViewModel_ onUnbind(
   }
 
   @Override
-  public void onVisibilityStateChanged(int visibilityState, final OnVisibilityStateChangedView object) {
+  public void onVisibilityStateChanged(int visibilityState,
+      final OnVisibilityStateChangedView object) {
     if (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null) {
       onModelVisibilityStateChangedListener_epoxyGeneratedModel.onVisibilityStateChanged(this, object, visibilityState);
     }
@@ -292,13 +293,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_CharSequence != null ? title_CharSequence.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_CharSequence != null ? title_CharSequence.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -312,4 +313,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/PropDefaultsViewModel_.java b/epoxy-processortest/src/test/resources/PropDefaultsViewModel_.java
index a7a13e8215..be79d245d9 100644
--- a/epoxy-processortest/src/test/resources/PropDefaultsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/PropDefaultsViewModel_.java
@@ -170,8 +170,7 @@ public void onVisibilityStateChanged(int visibilityState, final PropDefaultsView
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public PropDefaultsViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<PropDefaultsViewModel_, PropDefaultsView> listener) {
     onMutation();
@@ -193,8 +192,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public PropDefaultsViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<PropDefaultsViewModel_, PropDefaultsView> listener) {
     onMutation();
@@ -448,18 +446,18 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (defaultsToNull_CharSequence != null ? defaultsToNull_CharSequence.hashCode() : 0);
-    result = 31 * result + (noDefaultSoItIsRequired_CharSequence != null ? noDefaultSoItIsRequired_CharSequence.hashCode() : 0);
-    result = 31 * result + primitivesHaveImplicitDefaultsAndCannotBeRequired_Int;
-    result = 31 * result + primitiveWithExplicitDefault_Int;
-    result = 31 * result + (objectWithDefault_String != null ? objectWithDefault_String.hashCode() : 0);
-    result = 31 * result + (objectWithDefaultAndNullable_String != null ? objectWithDefaultAndNullable_String.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (defaultsToNull_CharSequence != null ? defaultsToNull_CharSequence.hashCode() : 0);
+    _result = 31 * _result + (noDefaultSoItIsRequired_CharSequence != null ? noDefaultSoItIsRequired_CharSequence.hashCode() : 0);
+    _result = 31 * _result + primitivesHaveImplicitDefaultsAndCannotBeRequired_Int;
+    _result = 31 * _result + primitiveWithExplicitDefault_Int;
+    _result = 31 * _result + (objectWithDefault_String != null ? objectWithDefault_String.hashCode() : 0);
+    _result = 31 * _result + (objectWithDefaultAndNullable_String != null ? objectWithDefaultAndNullable_String.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -478,4 +476,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/PropGroupsViewModel_.java b/epoxy-processortest/src/test/resources/PropGroupsViewModel_.java
index f10041ee8d..9bdfd04ad1 100644
--- a/epoxy-processortest/src/test/resources/PropGroupsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/PropGroupsViewModel_.java
@@ -335,8 +335,7 @@ public void onVisibilityStateChanged(int visibilityState, final PropGroupsView o
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public PropGroupsViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<PropGroupsViewModel_, PropGroupsView> listener) {
     onMutation();
@@ -358,8 +357,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public PropGroupsViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<PropGroupsViewModel_, PropGroupsView> listener) {
     onMutation();
@@ -810,26 +808,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (something_CharSequence != null ? something_CharSequence.hashCode() : 0);
-    result = 31 * result + something_Int;
-    result = 31 * result + (somethingElse_CharSequence != null ? somethingElse_CharSequence.hashCode() : 0);
-    result = 31 * result + somethingElse_Int;
-    result = 31 * result + primitive_Int;
-    result = 31 * result + (int) (primitive_Long ^ (primitive_Long >>> 32));
-    result = 31 * result + primitiveWithDefault_Int;
-    result = 31 * result + (int) (primitiveWithDefault_Long ^ (primitiveWithDefault_Long >>> 32));
-    result = 31 * result + (int) (primitiveAndObjectGroupWithPrimitiveDefault_Long ^ (primitiveAndObjectGroupWithPrimitiveDefault_Long >>> 32));
-    result = 31 * result + (primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null ? primitiveAndObjectGroupWithPrimitiveDefault_CharSequence.hashCode() : 0);
-    result = 31 * result + (int) (oneThing_Long ^ (oneThing_Long >>> 32));
-    result = 31 * result + (anotherThing_CharSequence != null ? anotherThing_CharSequence.hashCode() : 0);
-    result = 31 * result + (requiredGroup_String != null ? requiredGroup_String.hashCode() : 0);
-    result = 31 * result + (requiredGroup_CharSequence != null ? requiredGroup_CharSequence.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (something_CharSequence != null ? something_CharSequence.hashCode() : 0);
+    _result = 31 * _result + something_Int;
+    _result = 31 * _result + (somethingElse_CharSequence != null ? somethingElse_CharSequence.hashCode() : 0);
+    _result = 31 * _result + somethingElse_Int;
+    _result = 31 * _result + primitive_Int;
+    _result = 31 * _result + (int) (primitive_Long ^ (primitive_Long >>> 32));
+    _result = 31 * _result + primitiveWithDefault_Int;
+    _result = 31 * _result + (int) (primitiveWithDefault_Long ^ (primitiveWithDefault_Long >>> 32));
+    _result = 31 * _result + (int) (primitiveAndObjectGroupWithPrimitiveDefault_Long ^ (primitiveAndObjectGroupWithPrimitiveDefault_Long >>> 32));
+    _result = 31 * _result + (primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null ? primitiveAndObjectGroupWithPrimitiveDefault_CharSequence.hashCode() : 0);
+    _result = 31 * _result + (int) (oneThing_Long ^ (oneThing_Long >>> 32));
+    _result = 31 * _result + (anotherThing_CharSequence != null ? anotherThing_CharSequence.hashCode() : 0);
+    _result = 31 * _result + (requiredGroup_String != null ? requiredGroup_String.hashCode() : 0);
+    _result = 31 * _result + (requiredGroup_CharSequence != null ? requiredGroup_CharSequence.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -856,4 +854,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/RLayoutInViewModelAnnotationWorksViewModel_.java b/epoxy-processortest/src/test/resources/RLayoutInViewModelAnnotationWorksViewModel_.java
index 916df58fef..bb90e76845 100644
--- a/epoxy-processortest/src/test/resources/RLayoutInViewModelAnnotationWorksViewModel_.java
+++ b/epoxy-processortest/src/test/resources/RLayoutInViewModelAnnotationWorksViewModel_.java
@@ -107,8 +107,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public RLayoutInViewModelAnnotationWorksViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<RLayoutInViewModelAnnotationWorksViewModel_, RLayoutInViewModelAnnotationWorksView> listener) {
     onMutation();
@@ -130,8 +129,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public RLayoutInViewModelAnnotationWorksViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<RLayoutInViewModelAnnotationWorksViewModel_, RLayoutInViewModelAnnotationWorksView> listener) {
     onMutation();
@@ -253,12 +251,12 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -271,4 +269,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/SavedStateViewModel_.java b/epoxy-processortest/src/test/resources/SavedStateViewModel_.java
index 76c8a03d65..d3aa53c4c2 100644
--- a/epoxy-processortest/src/test/resources/SavedStateViewModel_.java
+++ b/epoxy-processortest/src/test/resources/SavedStateViewModel_.java
@@ -122,8 +122,7 @@ public void onVisibilityStateChanged(int visibilityState, final SavedStateView o
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public SavedStateViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<SavedStateViewModel_, SavedStateView> listener) {
     onMutation();
@@ -145,8 +144,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public SavedStateViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<SavedStateViewModel_, SavedStateView> listener) {
     onMutation();
@@ -290,13 +288,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (clickListener_String != null ? clickListener_String.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -315,4 +313,4 @@ public boolean shouldSaveViewState() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestAfterBindPropsViewModel_.java b/epoxy-processortest/src/test/resources/TestAfterBindPropsViewModel_.java
index 9030fb9f19..b7a72eb0e1 100644
--- a/epoxy-processortest/src/test/resources/TestAfterBindPropsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestAfterBindPropsViewModel_.java
@@ -126,8 +126,7 @@ public void onVisibilityStateChanged(int visibilityState, final TestAfterBindPro
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestAfterBindPropsViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestAfterBindPropsViewModel_, TestAfterBindPropsView> listener) {
     onMutation();
@@ -149,8 +148,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestAfterBindPropsViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestAfterBindPropsViewModel_, TestAfterBindPropsView> listener) {
     onMutation();
@@ -312,14 +310,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (flag_Boolean ? 1 : 0);
-    result = 31 * result + (flagSuper_Boolean ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (flag_Boolean ? 1 : 0);
+    _result = 31 * _result + (flagSuper_Boolean ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -334,4 +332,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestCallbackPropViewModel_.java b/epoxy-processortest/src/test/resources/TestCallbackPropViewModel_.java
index a47c24490a..4dad39d291 100644
--- a/epoxy-processortest/src/test/resources/TestCallbackPropViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestCallbackPropViewModel_.java
@@ -118,8 +118,7 @@ public void onVisibilityStateChanged(int visibilityState, final TestCallbackProp
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestCallbackPropViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestCallbackPropViewModel_, TestCallbackPropView> listener) {
     onMutation();
@@ -141,8 +140,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestCallbackPropViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestCallbackPropViewModel_, TestCallbackPropView> listener) {
     onMutation();
@@ -300,13 +298,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (listener_OnClickListener != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (listener_OnClickListener != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -320,4 +318,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestFieldPropCallbackPropViewModel_.java b/epoxy-processortest/src/test/resources/TestFieldPropCallbackPropViewModel_.java
index 1a54439bd5..817c7fd831 100644
--- a/epoxy-processortest/src/test/resources/TestFieldPropCallbackPropViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestFieldPropCallbackPropViewModel_.java
@@ -134,8 +134,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropCallbackPropViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestFieldPropCallbackPropViewModel_, TestFieldPropCallbackPropView> listener) {
     onMutation();
@@ -157,8 +156,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropCallbackPropViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestFieldPropCallbackPropViewModel_, TestFieldPropCallbackPropView> listener) {
     onMutation();
@@ -315,13 +313,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (value_OnClickListener != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (value_OnClickListener != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -335,4 +333,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestFieldPropChildViewModel_.java b/epoxy-processortest/src/test/resources/TestFieldPropChildViewModel_.java
index d2ddabf1c8..113b803d52 100644
--- a/epoxy-processortest/src/test/resources/TestFieldPropChildViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestFieldPropChildViewModel_.java
@@ -151,8 +151,7 @@ public void onVisibilityStateChanged(int visibilityState, final TestFieldPropChi
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropChildViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestFieldPropChildViewModel_, TestFieldPropChildView> listener) {
     onMutation();
@@ -174,8 +173,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropChildViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestFieldPropChildViewModel_, TestFieldPropChildView> listener) {
     onMutation();
@@ -321,7 +319,8 @@ public TestFieldPropChildViewModel_ layout(@LayoutRes int arg0) {
   }
 
   @Override
-  public TestFieldPropChildViewModel_ spanSizeOverride(@androidx.annotation.Nullable EpoxyModel.SpanSizeOverrideCallback arg0) {
+  public TestFieldPropChildViewModel_ spanSizeOverride(
+      @androidx.annotation.Nullable EpoxyModel.SpanSizeOverrideCallback arg0) {
     super.spanSizeOverride(arg0);
     return this;
   }
@@ -398,14 +397,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (textValue_StringAttributeData != null ? textValue_StringAttributeData.hashCode() : 0);
-    result = 31 * result + (value_OnClickListener != null ? value_OnClickListener.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (textValue_StringAttributeData != null ? textValue_StringAttributeData.hashCode() : 0);
+    _result = 31 * _result + (value_OnClickListener != null ? value_OnClickListener.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -420,4 +419,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestFieldPropDoNotHashOptionViewModel_.java b/epoxy-processortest/src/test/resources/TestFieldPropDoNotHashOptionViewModel_.java
index f7973ab2c8..3df76105a7 100644
--- a/epoxy-processortest/src/test/resources/TestFieldPropDoNotHashOptionViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestFieldPropDoNotHashOptionViewModel_.java
@@ -139,8 +139,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropDoNotHashOptionViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestFieldPropDoNotHashOptionViewModel_, TestFieldPropDoNotHashOptionView> listener) {
     onMutation();
@@ -162,8 +161,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropDoNotHashOptionViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestFieldPropDoNotHashOptionViewModel_, TestFieldPropDoNotHashOptionView> listener) {
     onMutation();
@@ -323,13 +321,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (value_OnClickListener != null ? 1 : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (value_OnClickListener != null ? 1 : 0);
+    return _result;
   }
 
   @Override
@@ -343,4 +341,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestFieldPropGenerateStringOverloadsOptionViewModel_.java b/epoxy-processortest/src/test/resources/TestFieldPropGenerateStringOverloadsOptionViewModel_.java
index e96732fdca..6461ec254a 100644
--- a/epoxy-processortest/src/test/resources/TestFieldPropGenerateStringOverloadsOptionViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestFieldPropGenerateStringOverloadsOptionViewModel_.java
@@ -142,8 +142,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropGenerateStringOverloadsOptionViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestFieldPropGenerateStringOverloadsOptionViewModel_, TestFieldPropGenerateStringOverloadsOptionView> listener) {
     onMutation();
@@ -166,8 +165,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropGenerateStringOverloadsOptionViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestFieldPropGenerateStringOverloadsOptionViewModel_, TestFieldPropGenerateStringOverloadsOptionView> listener) {
     onMutation();
@@ -356,13 +354,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (value_StringAttributeData != null ? value_StringAttributeData.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (value_StringAttributeData != null ? value_StringAttributeData.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -376,4 +374,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestFieldPropIgnoreRequireHashCodeOptionViewModel_.java b/epoxy-processortest/src/test/resources/TestFieldPropIgnoreRequireHashCodeOptionViewModel_.java
index d3ead9b8ac..2a030c7d0a 100644
--- a/epoxy-processortest/src/test/resources/TestFieldPropIgnoreRequireHashCodeOptionViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestFieldPropIgnoreRequireHashCodeOptionViewModel_.java
@@ -141,8 +141,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropIgnoreRequireHashCodeOptionViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestFieldPropIgnoreRequireHashCodeOptionViewModel_, TestFieldPropIgnoreRequireHashCodeOptionView> listener) {
     onMutation();
@@ -165,8 +164,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropIgnoreRequireHashCodeOptionViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestFieldPropIgnoreRequireHashCodeOptionViewModel_, TestFieldPropIgnoreRequireHashCodeOptionView> listener) {
     onMutation();
@@ -328,13 +326,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (value_OnClickListener != null ? value_OnClickListener.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (value_OnClickListener != null ? value_OnClickListener.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -348,4 +346,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestFieldPropModelPropViewModel_.java b/epoxy-processortest/src/test/resources/TestFieldPropModelPropViewModel_.java
index 627ed54193..4bed8367c3 100644
--- a/epoxy-processortest/src/test/resources/TestFieldPropModelPropViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestFieldPropModelPropViewModel_.java
@@ -131,8 +131,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropModelPropViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestFieldPropModelPropViewModel_, TestFieldPropModelPropView> listener) {
     onMutation();
@@ -154,8 +153,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropModelPropViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestFieldPropModelPropViewModel_, TestFieldPropModelPropView> listener) {
     onMutation();
@@ -296,13 +294,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + value_Int;
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + value_Int;
+    return _result;
   }
 
   @Override
@@ -316,4 +314,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestFieldPropNullOnRecycleOptionViewModel_.java b/epoxy-processortest/src/test/resources/TestFieldPropNullOnRecycleOptionViewModel_.java
index 2a6651da78..f636549088 100644
--- a/epoxy-processortest/src/test/resources/TestFieldPropNullOnRecycleOptionViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestFieldPropNullOnRecycleOptionViewModel_.java
@@ -134,8 +134,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropNullOnRecycleOptionViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestFieldPropNullOnRecycleOptionViewModel_, TestFieldPropNullOnRecycleOptionView> listener) {
     onMutation();
@@ -157,8 +156,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropNullOnRecycleOptionViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestFieldPropNullOnRecycleOptionViewModel_, TestFieldPropNullOnRecycleOptionView> listener) {
     onMutation();
@@ -205,7 +203,8 @@ public TestFieldPropNullOnRecycleOptionViewModel_ id(long id) {
   }
 
   @Override
-  public TestFieldPropNullOnRecycleOptionViewModel_ id(@androidx.annotation.Nullable Number... arg0) {
+  public TestFieldPropNullOnRecycleOptionViewModel_ id(
+      @androidx.annotation.Nullable Number... arg0) {
     super.id(arg0);
     return this;
   }
@@ -217,21 +216,23 @@ public TestFieldPropNullOnRecycleOptionViewModel_ id(long id1, long id2) {
   }
 
   @Override
-  public TestFieldPropNullOnRecycleOptionViewModel_ id(@androidx.annotation.Nullable CharSequence arg0) {
+  public TestFieldPropNullOnRecycleOptionViewModel_ id(
+      @androidx.annotation.Nullable CharSequence arg0) {
     super.id(arg0);
     return this;
   }
 
   @Override
-  public TestFieldPropNullOnRecycleOptionViewModel_ id(@androidx.annotation.Nullable CharSequence arg0,
+  public TestFieldPropNullOnRecycleOptionViewModel_ id(
+      @androidx.annotation.Nullable CharSequence arg0,
       @androidx.annotation.Nullable CharSequence... arg1) {
     super.id(arg0, arg1);
     return this;
   }
 
   @Override
-  public TestFieldPropNullOnRecycleOptionViewModel_ id(@androidx.annotation.Nullable CharSequence arg0,
-      long arg1) {
+  public TestFieldPropNullOnRecycleOptionViewModel_ id(
+      @androidx.annotation.Nullable CharSequence arg0, long arg1) {
     super.id(arg0, arg1);
     return this;
   }
@@ -242,7 +243,8 @@ public TestFieldPropNullOnRecycleOptionViewModel_ layout(@LayoutRes int arg0) {
   }
 
   @Override
-  public TestFieldPropNullOnRecycleOptionViewModel_ spanSizeOverride(@androidx.annotation.Nullable EpoxyModel.SpanSizeOverrideCallback arg0) {
+  public TestFieldPropNullOnRecycleOptionViewModel_ spanSizeOverride(
+      @androidx.annotation.Nullable EpoxyModel.SpanSizeOverrideCallback arg0) {
     super.spanSizeOverride(arg0);
     return this;
   }
@@ -315,13 +317,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (value_OnClickListener != null ? value_OnClickListener.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (value_OnClickListener != null ? value_OnClickListener.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -335,4 +337,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestFieldPropTextPropViewModel_.java b/epoxy-processortest/src/test/resources/TestFieldPropTextPropViewModel_.java
index b408ca8501..eb8c2b6a34 100644
--- a/epoxy-processortest/src/test/resources/TestFieldPropTextPropViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestFieldPropTextPropViewModel_.java
@@ -140,8 +140,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropTextPropViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestFieldPropTextPropViewModel_, TestFieldPropTextPropView> listener) {
     onMutation();
@@ -163,8 +162,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestFieldPropTextPropViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestFieldPropTextPropViewModel_, TestFieldPropTextPropView> listener) {
     onMutation();
@@ -351,13 +349,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (value_StringAttributeData != null ? value_StringAttributeData.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (value_StringAttributeData != null ? value_StringAttributeData.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -371,4 +369,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestManyTypesViewModel_.java b/epoxy-processortest/src/test/resources/TestManyTypesViewModel_.java
index 6c0c23bfcc..46f8f9a07c 100644
--- a/epoxy-processortest/src/test/resources/TestManyTypesViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestManyTypesViewModel_.java
@@ -285,8 +285,7 @@ public void onVisibilityStateChanged(int visibilityState, final TestManyTypesVie
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestManyTypesViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestManyTypesViewModel_, TestManyTypesView> listener) {
     onMutation();
@@ -308,8 +307,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestManyTypesViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestManyTypesViewModel_, TestManyTypesView> listener) {
     onMutation();
@@ -812,26 +810,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (stringValue_String != null ? stringValue_String.hashCode() : 0);
-    result = 31 * result + (nullableStringValue_String != null ? nullableStringValue_String.hashCode() : 0);
-    result = 31 * result + intValue_Int;
-    result = 31 * result + intValueWithAnnotation_Int;
-    result = 31 * result + intValueWithRangeAnnotation_Int;
-    result = 31 * result + intValueWithDimenTypeAnnotation_Int;
-    result = 31 * result + intWithMultipleAnnotations_Int;
-    result = 31 * result + (integerValue_Integer != null ? integerValue_Integer.hashCode() : 0);
-    result = 31 * result + (boolValue_Boolean ? 1 : 0);
-    result = 31 * result + (booleanValue_Boolean != null ? booleanValue_Boolean.hashCode() : 0);
-    result = 31 * result + Arrays.hashCode(arrayValue_StringArray);
-    result = 31 * result + (listValue_List != null ? listValue_List.hashCode() : 0);
-    result = 31 * result + (clickListener_OnClickListener != null ? 1 : 0);
-    result = 31 * result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (stringValue_String != null ? stringValue_String.hashCode() : 0);
+    _result = 31 * _result + (nullableStringValue_String != null ? nullableStringValue_String.hashCode() : 0);
+    _result = 31 * _result + intValue_Int;
+    _result = 31 * _result + intValueWithAnnotation_Int;
+    _result = 31 * _result + intValueWithRangeAnnotation_Int;
+    _result = 31 * _result + intValueWithDimenTypeAnnotation_Int;
+    _result = 31 * _result + intWithMultipleAnnotations_Int;
+    _result = 31 * _result + (integerValue_Integer != null ? integerValue_Integer.hashCode() : 0);
+    _result = 31 * _result + (boolValue_Boolean ? 1 : 0);
+    _result = 31 * _result + (booleanValue_Boolean != null ? booleanValue_Boolean.hashCode() : 0);
+    _result = 31 * _result + Arrays.hashCode(arrayValue_StringArray);
+    _result = 31 * _result + (listValue_List != null ? listValue_List.hashCode() : 0);
+    _result = 31 * _result + (clickListener_OnClickListener != null ? 1 : 0);
+    _result = 31 * _result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -858,4 +856,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestNullStringOverloadsViewModel_.java b/epoxy-processortest/src/test/resources/TestNullStringOverloadsViewModel_.java
index 31d563566b..853f078f0e 100644
--- a/epoxy-processortest/src/test/resources/TestNullStringOverloadsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestNullStringOverloadsViewModel_.java
@@ -119,8 +119,7 @@ public void onVisibilityStateChanged(int visibilityState,
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestNullStringOverloadsViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestNullStringOverloadsViewModel_, TestNullStringOverloadsView> listener) {
     onMutation();
@@ -142,8 +141,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestNullStringOverloadsViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestNullStringOverloadsViewModel_, TestNullStringOverloadsView> listener) {
     onMutation();
@@ -329,13 +327,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -349,4 +347,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestStringOverloadsViewModel_.java b/epoxy-processortest/src/test/resources/TestStringOverloadsViewModel_.java
index 8901a3503e..61b452794b 100644
--- a/epoxy-processortest/src/test/resources/TestStringOverloadsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestStringOverloadsViewModel_.java
@@ -158,8 +158,7 @@ public void onVisibilityStateChanged(int visibilityState, final TestStringOverlo
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestStringOverloadsViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestStringOverloadsViewModel_, TestStringOverloadsView> listener) {
     onMutation();
@@ -181,8 +180,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestStringOverloadsViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestStringOverloadsViewModel_, TestStringOverloadsView> listener) {
     onMutation();
@@ -461,15 +459,15 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
-    result = 31 * result + (title_List != null ? title_List.hashCode() : 0);
-    result = 31 * result + (titleViaValueShortcut_StringAttributeData != null ? titleViaValueShortcut_StringAttributeData.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
+    _result = 31 * _result + (title_List != null ? title_List.hashCode() : 0);
+    _result = 31 * _result + (titleViaValueShortcut_StringAttributeData != null ? titleViaValueShortcut_StringAttributeData.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -485,4 +483,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TestTextPropViewModel_.java b/epoxy-processortest/src/test/resources/TestTextPropViewModel_.java
index e317283672..1d902157f0 100644
--- a/epoxy-processortest/src/test/resources/TestTextPropViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestTextPropViewModel_.java
@@ -124,8 +124,7 @@ public void onVisibilityStateChanged(int visibilityState, final TestTextPropView
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestTextPropViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TestTextPropViewModel_, TestTextPropView> listener) {
     onMutation();
@@ -147,8 +146,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TestTextPropViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TestTextPropViewModel_, TestTextPropView> listener) {
     onMutation();
@@ -335,13 +333,13 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (title_StringAttributeData != null ? title_StringAttributeData.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -355,4 +353,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/epoxy-processortest/src/test/resources/TextPropDefaultViewModel_.java b/epoxy-processortest/src/test/resources/TextPropDefaultViewModel_.java
index 3efe29ca5f..b349741de3 100644
--- a/epoxy-processortest/src/test/resources/TextPropDefaultViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TextPropDefaultViewModel_.java
@@ -133,8 +133,7 @@ public void onVisibilityStateChanged(int visibilityState, final TextPropDefaultV
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TextPropDefaultViewModel_ onVisibilityStateChanged(
       OnModelVisibilityStateChangedListener<TextPropDefaultViewModel_, TextPropDefaultView> listener) {
     onMutation();
@@ -156,8 +155,7 @@ public void onVisibilityChanged(float percentVisibleHeight, float percentVisible
    * <p>
    * The listener will contribute to this model's hashCode state per the {@link
    * com.airbnb.epoxy.EpoxyAttribute.Option#DoNotHash} rules.
-   * <p>
-   * You may clear the listener by setting a null value, or by calling {@link #reset()} */
+   */
   public TextPropDefaultViewModel_ onVisibilityChanged(
       OnModelVisibilityChangedListener<TextPropDefaultViewModel_, TextPropDefaultView> listener) {
     onMutation();
@@ -410,14 +408,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    int result = super.hashCode();
-    result = 31 * result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
-    result = 31 * result + (textWithDefault_StringAttributeData != null ? textWithDefault_StringAttributeData.hashCode() : 0);
-    result = 31 * result + (nullableTextWithDefault_StringAttributeData != null ? nullableTextWithDefault_StringAttributeData.hashCode() : 0);
-    return result;
+    int _result = super.hashCode();
+    _result = 31 * _result + (onModelBoundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelUnboundListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityStateChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (onModelVisibilityChangedListener_epoxyGeneratedModel != null ? 1 : 0);
+    _result = 31 * _result + (textWithDefault_StringAttributeData != null ? textWithDefault_StringAttributeData.hashCode() : 0);
+    _result = 31 * _result + (nullableTextWithDefault_StringAttributeData != null ? nullableTextWithDefault_StringAttributeData.hashCode() : 0);
+    return _result;
   }
 
   @Override
@@ -432,4 +430,4 @@ public String toString() {
   public int getSpanSize(int totalSpanCount, int position, int itemCount) {
     return totalSpanCount;
   }
-}
+}
\ No newline at end of file
diff --git a/update_processor_test_resources.rb b/update_processor_test_resources.rb
index f3941183d6..9ce3e1e4d2 100644
--- a/update_processor_test_resources.rb
+++ b/update_processor_test_resources.rb
@@ -9,13 +9,18 @@
 require 'nokogiri'
 
 def updateTestClass(test_class_result)
-  puts "\nUpdating " + test_class_result + "\n"
   page = Nokogiri::HTML(open(test_class_result))
 
   # Failing processor tests have their output in a <pre></pre> block
   page.css('pre').each do |preBlock|
+
+    if preBlock.to_s.include? "[Robolectric]"
+      # This block is a robolectric info output, and is not a test failure
+      next
+    end
+
     # Just a sanity check to make sure the pre block we're looking at is a processor source output
-    if preBlock.include? "Source declared the same top-level types of an expected source"
+    if preBlock.to_s.include? "Source declared the same top-level types of an expected source"
       puts "Pre block did not contain source. (#{test_class_result}"
       next
     end
@@ -26,6 +31,8 @@ def updateTestClass(test_class_result)
     expected_file_match = /Expected file: <([^>]*)>/m.match(preBlock)
     if expected_file_match.nil? || expected_file_match.captures.empty?
       puts "Could not find expected file name in pre block (#{test_class_result})"
+      puts preBlock.class
+      puts preBlock
       next
     end