diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index 6b9790b83a..914a3ece43 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -57,8 +57,8 @@
           <option name="ANNOTATION_PARAMETER_WRAP" value="1" />
         </JavaCodeStyleSettings>
         <JetCodeStyleSettings>
-          <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="1" />
-          <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="1" />
+          <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="2147483647" />
+          <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="2147483647" />
         </JetCodeStyleSettings>
         <MarkdownNavigatorCodeStyleSettings>
           <option name="RIGHT_MARGIN" value="72" />
diff --git a/build.gradle b/build.gradle
index b69264fd20..b4b35de52f 100755
--- 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.1.51"
+  ext.KOTLIN_VERSION = "1.1.60"
   ext.ANDROID_PLUGIN_VERSION = "3.0.0"
 
   repositories {
diff --git a/epoxy-integrationtest/src/main/java/com/airbnb/epoxy/integrationtest/ViewWithAnnotationsForIntegrationTest.java b/epoxy-integrationtest/src/main/java/com/airbnb/epoxy/integrationtest/ViewWithAnnotationsForIntegrationTest.java
index 5c796c49a8..dd3256b141 100644
--- a/epoxy-integrationtest/src/main/java/com/airbnb/epoxy/integrationtest/ViewWithAnnotationsForIntegrationTest.java
+++ b/epoxy-integrationtest/src/main/java/com/airbnb/epoxy/integrationtest/ViewWithAnnotationsForIntegrationTest.java
@@ -5,6 +5,7 @@
 import android.util.AttributeSet;
 import android.view.View;
 
+import com.airbnb.epoxy.CallbackProp;
 import com.airbnb.epoxy.ModelProp;
 import com.airbnb.epoxy.ModelProp.Option;
 import com.airbnb.epoxy.ModelView;
@@ -51,4 +52,35 @@ public void setTextWithDefault(CharSequence text) {
   public void setNullableTextWithDefault(@Nullable CharSequence text) {
     nullableTextWithDefault = text;
   }
+
+  @CallbackProp
+  @Override
+  public void setOnClickListener(@Nullable OnClickListener l) {
+    super.setOnClickListener(l);
+  }
+
+  @ModelProp
+  public void setGroupWithNoDefault(String url) {
+
+  }
+
+  @CallbackProp
+  public void setGroupWithNoDefault(@Nullable OnClickListener url) {
+
+  }
+
+  @ModelProp
+  public void setGroupWithDefault(String url) {
+
+  }
+
+  @CallbackProp
+  public void setGroupWithDefault(@Nullable OnClickListener url) {
+
+  }
+
+  @ModelProp
+  public void setGroupWithDefault(int url) {
+
+  }
 }
diff --git a/epoxy-integrationtest/src/test/java/com/airbnb/epoxy/BindDiffTest.kt b/epoxy-integrationtest/src/test/java/com/airbnb/epoxy/BindDiffTest.kt
new file mode 100644
index 0000000000..087c285a0a
--- /dev/null
+++ b/epoxy-integrationtest/src/test/java/com/airbnb/epoxy/BindDiffTest.kt
@@ -0,0 +1,123 @@
+package com.airbnb.epoxy
+
+import android.view.View
+import com.airbnb.epoxy.integrationtest.BuildConfig
+import com.airbnb.epoxy.integrationtest.ViewWithAnnotationsForIntegrationTest
+import com.airbnb.epoxy.integrationtest.ViewWithAnnotationsForIntegrationTestModel_
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.mockito.Mockito.mock
+import org.mockito.Mockito.verify
+import org.robolectric.RobolectricTestRunner
+import org.robolectric.annotation.Config
+
+/** Tests that a partial bind of model (from a diff) binds the correct props. This is particularly tricky with prop groups. */
+@RunWith(RobolectricTestRunner::class)
+@Config(constants = BuildConfig::class, sdk = intArrayOf(21))
+class BindDiffTest {
+
+    private inline fun validateDiff(
+            model1Props: ViewWithAnnotationsForIntegrationTestModel_.() -> Unit,
+            model2Props: ViewWithAnnotationsForIntegrationTestModel_.() -> Unit,
+            viewCallVerifications: ViewWithAnnotationsForIntegrationTest.() -> Unit
+    ) {
+        val model1 = ViewWithAnnotationsForIntegrationTestModel_().id(1).apply(model1Props)
+        val model2 = ViewWithAnnotationsForIntegrationTestModel_().id(1).apply(model2Props)
+
+        val viewMock = mock(ViewWithAnnotationsForIntegrationTest::class.java)
+        model2.bind(viewMock, model1)
+
+        verify(viewMock).viewCallVerifications()
+    }
+
+    @Test
+    fun singlePropChanged() {
+        validateDiff(
+                model1Props = {
+                    requiredText("hello")
+                    groupWithNoDefault("text")
+                    groupWithDefault("text")
+                },
+                model2Props = {
+                    requiredText("hello2")
+                    groupWithNoDefault("text")
+                    groupWithDefault("text")
+                },
+                viewCallVerifications = {
+                    setRequiredText("hello2")
+                }
+        )
+    }
+
+    @Test
+    fun multiplePropsChanged() {
+        validateDiff(
+                model1Props = {
+                    requiredText("hello")
+                    groupWithNoDefault("text")
+                },
+                model2Props = {
+                    requiredText("hello2")
+                    groupWithNoDefault("text2")
+                },
+                viewCallVerifications = {
+                    setGroupWithNoDefault("text2")
+                    setRequiredText("hello2")
+                }
+        )
+    }
+
+    @Test
+    fun propGroupChangedFromOneAttributeToAnother() {
+        val clickListener = View.OnClickListener { v -> }
+        validateDiff(
+                model1Props = {
+                    requiredText("hello")
+                    groupWithNoDefault("text")
+                },
+                model2Props = {
+                    requiredText("hello")
+                    groupWithNoDefault(clickListener)
+                },
+                viewCallVerifications = {
+                    setGroupWithNoDefault(clickListener)
+                }
+        )
+    }
+
+    @Test
+    fun propGroupChangedToDefault() {
+        validateDiff(
+                model1Props = {
+                    requiredText("hello")
+                    groupWithNoDefault("text")
+                    groupWithDefault("custom value")
+                },
+                model2Props = {
+                    requiredText("hello")
+                    groupWithNoDefault("text")
+                },
+                viewCallVerifications = {
+                    setGroupWithDefault(null as View.OnClickListener?)
+                }
+        )
+    }
+
+    @Test
+    fun propGroupChangedFromDefault() {
+        validateDiff(
+                model1Props = {
+                    requiredText("hello")
+                    groupWithNoDefault("text")
+                },
+                model2Props = {
+                    requiredText("hello")
+                    groupWithNoDefault("text")
+                    groupWithDefault("custom value")
+                },
+                viewCallVerifications = {
+                    setGroupWithDefault("custom value")
+                }
+        )
+    }
+}
\ No newline at end of file
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 d7555562f1..5b18387f0d 100644
--- a/epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelWriter.kt
+++ b/epoxy-processor/src/main/java/com/airbnb/epoxy/GeneratedModelWriter.kt
@@ -1346,26 +1346,35 @@ internal class GeneratedModelWriter(
                 useObjectHashCode: Boolean,
                 type: TypeName,
                 accessorCode: String
-        ) = with(builder) {
-            if (useObjectHashCode) {
-                when {
-                    type === FLOAT -> beginControlFlow("if (Float.compare(that.\$L, \$L) != 0)",
-                                                       accessorCode, accessorCode)
-                    type === DOUBLE -> beginControlFlow("if (Double.compare(that.\$L, \$L) != 0)",
-                                                        accessorCode, accessorCode)
-                    type.isPrimitive -> beginControlFlow("if (\$L != that.\$L)",
-                                                         accessorCode, accessorCode)
-                    type is ArrayTypeName -> beginControlFlow("if (!\$T.equals(\$L, that.\$L))",
-                                                              TypeName.get(Arrays::class.java),
-                                                              accessorCode, accessorCode)
-                    else -> beginControlFlow(
-                            "if (\$L != null ? !\$L.equals(that.\$L) : that.\$L != null)",
-                            accessorCode, accessorCode, accessorCode, accessorCode)
-                }
-            } else {
-                beginControlFlow("if ((\$L == null) != (that.\$L == null))", accessorCode,
-                                 accessorCode)
+        ) = builder.beginControlFlow("if (\$L)",
+                                     notEqualsCodeBlock(useObjectHashCode, type, accessorCode))
+
+        fun notEqualsCodeBlock(attribute: AttributeInfo): CodeBlock {
+            val attributeType = attribute.typeName
+            val useHash = attributeType.isPrimitive || attribute.useInHash()
+            return notEqualsCodeBlock(useHash, attributeType, attribute.getterCode())
+        }
+
+        fun notEqualsCodeBlock(
+                useObjectHashCode: Boolean,
+                type: TypeName,
+                accessorCode: String
+        ): CodeBlock = if (useObjectHashCode) {
+            when {
+                type === FLOAT -> CodeBlock.of("(Float.compare(that.\$L, \$L) != 0)",
+                                               accessorCode, accessorCode)
+                type === DOUBLE -> CodeBlock.of("(Double.compare(that.\$L, \$L) != 0)",
+                                                accessorCode, accessorCode)
+                type.isPrimitive -> CodeBlock.of("(\$L != that.\$L)", accessorCode, accessorCode)
+                type is ArrayTypeName -> CodeBlock.of("!\$T.equals(\$L, that.\$L)",
+                                                      TypeName.get(Arrays::class.java),
+                                                      accessorCode, accessorCode)
+                else -> CodeBlock.of(
+                        "(\$L != null ? !\$L.equals(that.\$L) : that.\$L != null)",
+                        accessorCode, accessorCode, accessorCode, accessorCode)
             }
+        } else {
+            CodeBlock.of("((\$L == null) != (that.\$L == null))", accessorCode, accessorCode)
         }
 
         private fun addHashCodeLineForType(
diff --git a/epoxy-processor/src/main/java/com/airbnb/epoxy/ModelViewWriter.kt b/epoxy-processor/src/main/java/com/airbnb/epoxy/ModelViewWriter.kt
index 7f66ed5e4d..1bff20d244 100644
--- a/epoxy-processor/src/main/java/com/airbnb/epoxy/ModelViewWriter.kt
+++ b/epoxy-processor/src/main/java/com/airbnb/epoxy/ModelViewWriter.kt
@@ -76,11 +76,10 @@ internal class ModelViewWriter(
 
                         methodBuilder.beginControlFlow(
                                 "else")
-                                .addStatement(
-                                        "\$L.\$L(\$L)",
-                                        boundObjectParam.name,
-                                        defaultAttribute.viewSetterMethodName,
-                                        defaultAttribute.codeToSetDefault.value())
+                                .addCode(
+                                        buildCodeBlockToSetAttribute(
+                                                boundObjectParam,
+                                                defaultAttribute))
                                 .endControlFlow()
                     }
                 }
@@ -95,101 +94,78 @@ internal class ModelViewWriter(
         ) {
 
             for (attributeGroup in modelInfo.attributeGroups) {
+                val attributes = attributeGroup.attributes
+
                 methodBuilder.addCode("\n")
-                if (attributeGroup.attributes.size == 1) {
-                    val attributeInfo = attributeGroup.attributes[0]
 
-                    if (attributeInfo is ViewAttributeInfo && attributeInfo.generateStringOverloads) {
-                        methodBuilder
-                                .beginControlFlow(
-                                        "if (!\$L.equals(that.\$L))",
-                                        attributeInfo.getterCode(),
-                                        attributeInfo.getterCode())
-                    } else {
-                        GeneratedModelWriter.startNotEqualsControlFlow(
-                                methodBuilder,
-                                attributeInfo)
-                    }
+                if (attributes.size == 1) {
+                    val attribute = attributes.first()
 
-                    methodBuilder.addCode(
-                            buildCodeBlockToSetAttribute(
-                                    boundObjectParam,
-                                    attributeInfo as ViewAttributeInfo))
-                            .endControlFlow()
-                } else {
-                    methodBuilder.beginControlFlow(
-                            "if (\$L.equals(that.\$L))",
-                            GeneratedModelWriter.ATTRIBUTES_BITSET_FIELD_NAME,
-                            GeneratedModelWriter.ATTRIBUTES_BITSET_FIELD_NAME)
-
-                    var firstAttribute = true
-                    for (attribute in attributeGroup.attributes) {
-                        if (!firstAttribute) {
-                            methodBuilder.addCode(
-                                    " else ")
-                        }
-                        firstAttribute = false
+                    methodBuilder.apply {
+                        GeneratedModelWriter.startNotEqualsControlFlow(this, attribute)
 
-                        methodBuilder.beginControlFlow(
-                                "if (\$L)",
-                                GeneratedModelWriter.isAttributeSetCode(
-                                        modelInfo,
-                                        attribute))
+                        addCode(buildCodeBlockToSetAttribute(
+                                boundObjectParam,
+                                attribute as ViewAttributeInfo))
 
-                        GeneratedModelWriter.startNotEqualsControlFlow(
-                                methodBuilder,
-                                attribute)
-                                .addCode(
-                                        buildCodeBlockToSetAttribute(
-                                                boundObjectParam,
-                                                attribute as ViewAttributeInfo))
-                                .endControlFlow()
-                                .endControlFlow()
+                        endControlFlow()
                     }
+                } else {
 
-                    methodBuilder.endControlFlow()
-                            .beginControlFlow("else")
+                    for ((index, attribute) in attributes.withIndex()) {
+                        val isAttributeSetCode = GeneratedModelWriter.isAttributeSetCode(
+                                modelInfo,
+                                attribute)
 
-                    firstAttribute = true
-                    for (attribute in attributeGroup.attributes) {
-                        if (!firstAttribute) {
-                            methodBuilder.addCode(
-                                    " else ")
-                        }
-                        firstAttribute = false
+                        methodBuilder.apply {
+                            beginControlFlow("${if (index != 0) "else " else ""}if (\$L)",
+                                             isAttributeSetCode)
 
-                        methodBuilder.beginControlFlow(
-                                "if (\$L && !that.\$L)",
-                                GeneratedModelWriter.isAttributeSetCode(
-                                        modelInfo,
-                                        attribute),
-                                GeneratedModelWriter.isAttributeSetCode(
-                                        modelInfo,
-                                        attribute))
-                                .addCode(
-                                        buildCodeBlockToSetAttribute(
-                                                boundObjectParam,
-                                                attribute as ViewAttributeInfo))
-                                .endControlFlow()
+                            // For primitives we do a simple != check to check if the prop changed from the previous model.
+                            // For objects we first check if the prop was not set on the previous model to be able to skip the equals check in some cases
+                            if (attribute.isPrimitive) {
+                                GeneratedModelWriter.startNotEqualsControlFlow(this, attribute)
+                            } else {
+                                beginControlFlow("if (!that.\$L || \$L)", isAttributeSetCode,
+                                                 GeneratedModelWriter.notEqualsCodeBlock(attribute))
+                            }
+
+                            addCode(buildCodeBlockToSetAttribute(
+                                    boundObjectParam,
+                                    attribute as ViewAttributeInfo))
+
+                            endControlFlow()
+                            endControlFlow()
+                        }
                     }
 
                     if (!attributeGroup.isRequired) {
                         val defaultAttribute = attributeGroup.defaultAttribute as ViewAttributeInfo
 
-                        methodBuilder.beginControlFlow(
-                                "else")
-                                .addStatement(
-                                        "\$L.\$L(\$L)",
-                                        boundObjectParam.name,
-                                        defaultAttribute.viewSetterMethodName,
-                                        defaultAttribute.codeToSetDefault.value())
+                        val ifConditionArgs = StringBuilder().apply {
+                            attributes.indices.forEach {
+                                if (it != 0) {
+                                    append(" || ")
+                                }
+                                append("that.\$L")
+                            }
+                        }
+
+                        val ifConditionValues = attributes.map {
+                            GeneratedModelWriter.isAttributeSetCode(modelInfo, it)
+                        }
+
+                        methodBuilder
+                                .addComment(
+                                        "A value was not set so we should use the default value, but we only need to set it if the previous model had a custom value set.")
+                                .beginControlFlow("else if ($ifConditionArgs)",
+                                                  *ifConditionValues.toTypedArray())
+                                .addCode(buildCodeBlockToSetAttribute(
+                                        boundObjectParam, defaultAttribute))
                                 .endControlFlow()
                     }
-
-                    methodBuilder.endControlFlow()
                 }
             }
-
         }
 
         override fun addToHandlePostBindMethod(
@@ -210,9 +186,10 @@ internal class ModelViewWriter(
                     .filter { it.resetWithNull }
                     .forEach {
                         unbindBuilder.addStatement(
-                                "\$L.\$L(null)",
+                                "\$L.\$L((\$T) null)",
                                 unbindParamName,
-                                it.viewSetterMethodName)
+                                it.viewSetterMethodName,
+                                it.typeMirror)
                     }
 
             addResetMethodsToBuilder(unbindBuilder,
diff --git a/epoxy-processortest/src/test/resources/AbstractModelWithHolder_.java b/epoxy-processortest/src/test/resources/AbstractModelWithHolder_.java
index 336bfa9da5..de889f26f8 100755
--- a/epoxy-processortest/src/test/resources/AbstractModelWithHolder_.java
+++ b/epoxy-processortest/src/test/resources/AbstractModelWithHolder_.java
@@ -175,13 +175,13 @@ public boolean equals(Object o) {
       return false;
     }
     AbstractModelWithHolder_ that = (AbstractModelWithHolder_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/AutoLayoutModelViewMatchParentModel_.java b/epoxy-processortest/src/test/resources/AutoLayoutModelViewMatchParentModel_.java
index 8ddc1d615f..e5f8883331 100644
--- a/epoxy-processortest/src/test/resources/AutoLayoutModelViewMatchParentModel_.java
+++ b/epoxy-processortest/src/test/resources/AutoLayoutModelViewMatchParentModel_.java
@@ -63,7 +63,7 @@ public void bind(final AutoLayoutModelViewMatchParent object, EpoxyModel previou
     AutoLayoutModelViewMatchParentModel_ that = (AutoLayoutModelViewMatchParentModel_) previousModel;
     super.bind(object);
 
-    if (value_Int != that.value_Int) {
+    if ((value_Int != that.value_Int)) {
       object.setValue(value_Int);
     }
   }
@@ -219,13 +219,13 @@ public boolean equals(Object o) {
       return false;
     }
     AutoLayoutModelViewMatchParentModel_ that = (AutoLayoutModelViewMatchParentModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value_Int != that.value_Int) {
+    if ((value_Int != that.value_Int)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/AutoLayoutModelViewModel_.java b/epoxy-processortest/src/test/resources/AutoLayoutModelViewModel_.java
index 4a8452c731..0319156783 100644
--- a/epoxy-processortest/src/test/resources/AutoLayoutModelViewModel_.java
+++ b/epoxy-processortest/src/test/resources/AutoLayoutModelViewModel_.java
@@ -63,7 +63,7 @@ public void bind(final AutoLayoutModelView object, EpoxyModel previousModel) {
     AutoLayoutModelViewModel_ that = (AutoLayoutModelViewModel_) previousModel;
     super.bind(object);
 
-    if (value_Int != that.value_Int) {
+    if ((value_Int != that.value_Int)) {
       object.setValue(value_Int);
     }
   }
@@ -219,13 +219,13 @@ public boolean equals(Object o) {
       return false;
     }
     AutoLayoutModelViewModel_ that = (AutoLayoutModelViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value_Int != that.value_Int) {
+    if ((value_Int != that.value_Int)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/BaseModelFromPackageConfigViewModel_.java b/epoxy-processortest/src/test/resources/BaseModelFromPackageConfigViewModel_.java
index 955da74bfb..204e899176 100644
--- a/epoxy-processortest/src/test/resources/BaseModelFromPackageConfigViewModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelFromPackageConfigViewModel_.java
@@ -60,7 +60,7 @@ public void bind(final BaseModelView object, EpoxyModel previousModel) {
     BaseModelViewModel_ that = (BaseModelViewModel_) previousModel;
     super.bind(object);
 
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       object.setClickListener(clickListener_String);
     }
   }
@@ -221,13 +221,13 @@ public boolean equals(Object o) {
       return false;
     }
     BaseModelViewModel_ that = (BaseModelViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/BaseModelOverridesPackageConfigViewModel_.java b/epoxy-processortest/src/test/resources/BaseModelOverridesPackageConfigViewModel_.java
index 18a05b7c49..c1cc128534 100644
--- a/epoxy-processortest/src/test/resources/BaseModelOverridesPackageConfigViewModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelOverridesPackageConfigViewModel_.java
@@ -56,7 +56,7 @@ public void bind(final BaseModelView object, EpoxyModel previousModel) {
     BaseModelViewModel_ that = (BaseModelViewModel_) previousModel;
     super.bind(object);
 
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       object.setClickListener(clickListener_String);
     }
   }
@@ -217,13 +217,13 @@ public boolean equals(Object o) {
       return false;
     }
     BaseModelViewModel_ that = (BaseModelViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/BaseModelViewModel_.java b/epoxy-processortest/src/test/resources/BaseModelViewModel_.java
index 803a0b769f..2c13c329f3 100644
--- a/epoxy-processortest/src/test/resources/BaseModelViewModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelViewModel_.java
@@ -60,7 +60,7 @@ public void bind(final BaseModelView object, EpoxyModel previousModel) {
     BaseModelViewModel_ that = (BaseModelViewModel_) previousModel;
     super.bind(object);
 
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       object.setClickListener(clickListener_String);
     }
   }
@@ -221,13 +221,13 @@ public boolean equals(Object o) {
       return false;
     }
     BaseModelViewModel_ that = (BaseModelViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/BaseModelViewWithSuperDiffBindModel_.java b/epoxy-processortest/src/test/resources/BaseModelViewWithSuperDiffBindModel_.java
index fba3f1475f..90735a7727 100644
--- a/epoxy-processortest/src/test/resources/BaseModelViewWithSuperDiffBindModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelViewWithSuperDiffBindModel_.java
@@ -60,7 +60,7 @@ public void bind(final BaseModelView object, EpoxyModel previousModel) {
     BaseModelViewModel_ that = (BaseModelViewModel_) previousModel;
     super.bind(object, previousModel);
 
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       object.setClickListener(clickListener_String);
     }
   }
@@ -221,13 +221,13 @@ public boolean equals(Object o) {
       return false;
     }
     BaseModelViewModel_ that = (BaseModelViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/BaseModelWithAttributeViewModel_.java b/epoxy-processortest/src/test/resources/BaseModelWithAttributeViewModel_.java
index b433acb457..a25051a609 100644
--- a/epoxy-processortest/src/test/resources/BaseModelWithAttributeViewModel_.java
+++ b/epoxy-processortest/src/test/resources/BaseModelWithAttributeViewModel_.java
@@ -60,7 +60,7 @@ public void bind(final BaseModelView object, EpoxyModel previousModel) {
     BaseModelViewModel_ that = (BaseModelViewModel_) previousModel;
     super.bind(object);
 
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       object.setClickListener(clickListener_String);
     }
   }
@@ -233,16 +233,16 @@ public boolean equals(Object o) {
       return false;
     }
     BaseModelViewModel_ that = (BaseModelViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       return false;
     }
-    if (baseModelString != null ? !baseModelString.equals(that.baseModelString) : that.baseModelString != null) {
+    if ((baseModelString != null ? !baseModelString.equals(that.baseModelString) : that.baseModelString != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/BasicModelWithAttribute_.java b/epoxy-processortest/src/test/resources/BasicModelWithAttribute_.java
index daba50ed60..b2341f9fa1 100755
--- a/epoxy-processortest/src/test/resources/BasicModelWithAttribute_.java
+++ b/epoxy-processortest/src/test/resources/BasicModelWithAttribute_.java
@@ -169,13 +169,13 @@ public boolean equals(Object o) {
       return false;
     }
     BasicModelWithAttribute_ that = (BasicModelWithAttribute_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/CustomPackageLayoutPatternViewModel_.java b/epoxy-processortest/src/test/resources/CustomPackageLayoutPatternViewModel_.java
index 8d25693e6a..e20625acac 100644
--- a/epoxy-processortest/src/test/resources/CustomPackageLayoutPatternViewModel_.java
+++ b/epoxy-processortest/src/test/resources/CustomPackageLayoutPatternViewModel_.java
@@ -180,10 +180,10 @@ public boolean equals(Object o) {
       return false;
     }
     CustomPackageLayoutPatternViewModel_ that = (CustomPackageLayoutPatternViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypesNoValidation_.java b/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypesNoValidation_.java
index 9e19929937..b37856211c 100644
--- a/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypesNoValidation_.java
+++ b/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypesNoValidation_.java
@@ -385,52 +385,52 @@ protected void setDataBindingVariables(ViewDataBinding binding, EpoxyModel previ
       return;
     }
     DataBindingModelWithAllFieldTypesNoValidation_ that = (DataBindingModelWithAllFieldTypesNoValidation_) previousModel;
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       binding.setVariable(BR.valueInt, valueInt);
     }
-    if (valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null) {
+    if ((valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null)) {
       binding.setVariable(BR.valueInteger, valueInteger);
     }
-    if (valueShort != that.valueShort) {
+    if ((valueShort != that.valueShort)) {
       binding.setVariable(BR.valueShort, valueShort);
     }
-    if (valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null) {
+    if ((valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null)) {
       binding.setVariable(BR.valueShortWrapper, valueShortWrapper);
     }
-    if (valueChar != that.valueChar) {
+    if ((valueChar != that.valueChar)) {
       binding.setVariable(BR.valueChar, valueChar);
     }
-    if (valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null) {
+    if ((valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null)) {
       binding.setVariable(BR.valueCharacter, valueCharacter);
     }
-    if (valuebByte != that.valuebByte) {
+    if ((valuebByte != that.valuebByte)) {
       binding.setVariable(BR.valuebByte, valuebByte);
     }
-    if (valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null) {
+    if ((valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null)) {
       binding.setVariable(BR.valueByteWrapper, valueByteWrapper);
     }
-    if (valueLong != that.valueLong) {
+    if ((valueLong != that.valueLong)) {
       binding.setVariable(BR.valueLong, valueLong);
     }
-    if (valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null) {
+    if ((valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null)) {
       binding.setVariable(BR.valueLongWrapper, valueLongWrapper);
     }
-    if (Double.compare(that.valueDouble, valueDouble) != 0) {
+    if ((Double.compare(that.valueDouble, valueDouble) != 0)) {
       binding.setVariable(BR.valueDouble, valueDouble);
     }
-    if (valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null) {
+    if ((valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null)) {
       binding.setVariable(BR.valueDoubleWrapper, valueDoubleWrapper);
     }
-    if (Float.compare(that.valueFloat, valueFloat) != 0) {
+    if ((Float.compare(that.valueFloat, valueFloat) != 0)) {
       binding.setVariable(BR.valueFloat, valueFloat);
     }
-    if (valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null) {
+    if ((valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null)) {
       binding.setVariable(BR.valueFloatWrapper, valueFloatWrapper);
     }
-    if (valueBoolean != that.valueBoolean) {
+    if ((valueBoolean != that.valueBoolean)) {
       binding.setVariable(BR.valueBoolean, valueBoolean);
     }
-    if (valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null) {
+    if ((valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null)) {
       binding.setVariable(BR.valueBooleanWrapper, valueBooleanWrapper);
     }
     if (!Arrays.equals(valueIntArray, that.valueIntArray)) {
@@ -439,13 +439,13 @@ protected void setDataBindingVariables(ViewDataBinding binding, EpoxyModel previ
     if (!Arrays.equals(valueObjectArray, that.valueObjectArray)) {
       binding.setVariable(BR.valueObjectArray, valueObjectArray);
     }
-    if (valueString != null ? !valueString.equals(that.valueString) : that.valueString != null) {
+    if ((valueString != null ? !valueString.equals(that.valueString) : that.valueString != null)) {
       binding.setVariable(BR.valueString, valueString);
     }
-    if (valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null) {
+    if ((valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null)) {
       binding.setVariable(BR.valueObject, valueObject);
     }
-    if (valueList != null ? !valueList.equals(that.valueList) : that.valueList != null) {
+    if ((valueList != null ? !valueList.equals(that.valueList) : that.valueList != null)) {
       binding.setVariable(BR.valueList, valueList);
     }
   }
@@ -491,58 +491,58 @@ public boolean equals(Object o) {
       return false;
     }
     DataBindingModelWithAllFieldTypesNoValidation_ that = (DataBindingModelWithAllFieldTypesNoValidation_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       return false;
     }
-    if (valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null) {
+    if ((valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null)) {
       return false;
     }
-    if (valueShort != that.valueShort) {
+    if ((valueShort != that.valueShort)) {
       return false;
     }
-    if (valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null) {
+    if ((valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null)) {
       return false;
     }
-    if (valueChar != that.valueChar) {
+    if ((valueChar != that.valueChar)) {
       return false;
     }
-    if (valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null) {
+    if ((valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null)) {
       return false;
     }
-    if (valuebByte != that.valuebByte) {
+    if ((valuebByte != that.valuebByte)) {
       return false;
     }
-    if (valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null) {
+    if ((valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null)) {
       return false;
     }
-    if (valueLong != that.valueLong) {
+    if ((valueLong != that.valueLong)) {
       return false;
     }
-    if (valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null) {
+    if ((valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null)) {
       return false;
     }
-    if (Double.compare(that.valueDouble, valueDouble) != 0) {
+    if ((Double.compare(that.valueDouble, valueDouble) != 0)) {
       return false;
     }
-    if (valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null) {
+    if ((valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null)) {
       return false;
     }
-    if (Float.compare(that.valueFloat, valueFloat) != 0) {
+    if ((Float.compare(that.valueFloat, valueFloat) != 0)) {
       return false;
     }
-    if (valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null) {
+    if ((valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null)) {
       return false;
     }
-    if (valueBoolean != that.valueBoolean) {
+    if ((valueBoolean != that.valueBoolean)) {
       return false;
     }
-    if (valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null) {
+    if ((valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null)) {
       return false;
     }
     if (!Arrays.equals(valueIntArray, that.valueIntArray)) {
@@ -551,13 +551,13 @@ public boolean equals(Object o) {
     if (!Arrays.equals(valueObjectArray, that.valueObjectArray)) {
       return false;
     }
-    if (valueString != null ? !valueString.equals(that.valueString) : that.valueString != null) {
+    if ((valueString != null ? !valueString.equals(that.valueString) : that.valueString != null)) {
       return false;
     }
-    if (valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null) {
+    if ((valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null)) {
       return false;
     }
-    if (valueList != null ? !valueList.equals(that.valueList) : that.valueList != null) {
+    if ((valueList != null ? !valueList.equals(that.valueList) : that.valueList != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypes_.java b/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypes_.java
index 05adc8a9a6..8465cd6193 100644
--- a/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypes_.java
+++ b/epoxy-processortest/src/test/resources/DataBindingModelWithAllFieldTypes_.java
@@ -435,52 +435,52 @@ protected void setDataBindingVariables(ViewDataBinding binding, EpoxyModel previ
       return;
     }
     DataBindingModelWithAllFieldTypes_ that = (DataBindingModelWithAllFieldTypes_) previousModel;
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       binding.setVariable(BR.valueInt, valueInt);
     }
-    if (valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null) {
+    if ((valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null)) {
       binding.setVariable(BR.valueInteger, valueInteger);
     }
-    if (valueShort != that.valueShort) {
+    if ((valueShort != that.valueShort)) {
       binding.setVariable(BR.valueShort, valueShort);
     }
-    if (valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null) {
+    if ((valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null)) {
       binding.setVariable(BR.valueShortWrapper, valueShortWrapper);
     }
-    if (valueChar != that.valueChar) {
+    if ((valueChar != that.valueChar)) {
       binding.setVariable(BR.valueChar, valueChar);
     }
-    if (valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null) {
+    if ((valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null)) {
       binding.setVariable(BR.valueCharacter, valueCharacter);
     }
-    if (valuebByte != that.valuebByte) {
+    if ((valuebByte != that.valuebByte)) {
       binding.setVariable(BR.valuebByte, valuebByte);
     }
-    if (valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null) {
+    if ((valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null)) {
       binding.setVariable(BR.valueByteWrapper, valueByteWrapper);
     }
-    if (valueLong != that.valueLong) {
+    if ((valueLong != that.valueLong)) {
       binding.setVariable(BR.valueLong, valueLong);
     }
-    if (valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null) {
+    if ((valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null)) {
       binding.setVariable(BR.valueLongWrapper, valueLongWrapper);
     }
-    if (Double.compare(that.valueDouble, valueDouble) != 0) {
+    if ((Double.compare(that.valueDouble, valueDouble) != 0)) {
       binding.setVariable(BR.valueDouble, valueDouble);
     }
-    if (valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null) {
+    if ((valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null)) {
       binding.setVariable(BR.valueDoubleWrapper, valueDoubleWrapper);
     }
-    if (Float.compare(that.valueFloat, valueFloat) != 0) {
+    if ((Float.compare(that.valueFloat, valueFloat) != 0)) {
       binding.setVariable(BR.valueFloat, valueFloat);
     }
-    if (valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null) {
+    if ((valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null)) {
       binding.setVariable(BR.valueFloatWrapper, valueFloatWrapper);
     }
-    if (valueBoolean != that.valueBoolean) {
+    if ((valueBoolean != that.valueBoolean)) {
       binding.setVariable(BR.valueBoolean, valueBoolean);
     }
-    if (valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null) {
+    if ((valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null)) {
       binding.setVariable(BR.valueBooleanWrapper, valueBooleanWrapper);
     }
     if (!Arrays.equals(valueIntArray, that.valueIntArray)) {
@@ -489,13 +489,13 @@ protected void setDataBindingVariables(ViewDataBinding binding, EpoxyModel previ
     if (!Arrays.equals(valueObjectArray, that.valueObjectArray)) {
       binding.setVariable(BR.valueObjectArray, valueObjectArray);
     }
-    if (valueString != null ? !valueString.equals(that.valueString) : that.valueString != null) {
+    if ((valueString != null ? !valueString.equals(that.valueString) : that.valueString != null)) {
       binding.setVariable(BR.valueString, valueString);
     }
-    if (valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null) {
+    if ((valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null)) {
       binding.setVariable(BR.valueObject, valueObject);
     }
-    if (valueList != null ? !valueList.equals(that.valueList) : that.valueList != null) {
+    if ((valueList != null ? !valueList.equals(that.valueList) : that.valueList != null)) {
       binding.setVariable(BR.valueList, valueList);
     }
   }
@@ -541,58 +541,58 @@ public boolean equals(Object o) {
       return false;
     }
     DataBindingModelWithAllFieldTypes_ that = (DataBindingModelWithAllFieldTypes_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       return false;
     }
-    if (valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null) {
+    if ((valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null)) {
       return false;
     }
-    if (valueShort != that.valueShort) {
+    if ((valueShort != that.valueShort)) {
       return false;
     }
-    if (valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null) {
+    if ((valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null)) {
       return false;
     }
-    if (valueChar != that.valueChar) {
+    if ((valueChar != that.valueChar)) {
       return false;
     }
-    if (valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null) {
+    if ((valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null)) {
       return false;
     }
-    if (valuebByte != that.valuebByte) {
+    if ((valuebByte != that.valuebByte)) {
       return false;
     }
-    if (valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null) {
+    if ((valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null)) {
       return false;
     }
-    if (valueLong != that.valueLong) {
+    if ((valueLong != that.valueLong)) {
       return false;
     }
-    if (valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null) {
+    if ((valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null)) {
       return false;
     }
-    if (Double.compare(that.valueDouble, valueDouble) != 0) {
+    if ((Double.compare(that.valueDouble, valueDouble) != 0)) {
       return false;
     }
-    if (valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null) {
+    if ((valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null)) {
       return false;
     }
-    if (Float.compare(that.valueFloat, valueFloat) != 0) {
+    if ((Float.compare(that.valueFloat, valueFloat) != 0)) {
       return false;
     }
-    if (valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null) {
+    if ((valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null)) {
       return false;
     }
-    if (valueBoolean != that.valueBoolean) {
+    if ((valueBoolean != that.valueBoolean)) {
       return false;
     }
-    if (valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null) {
+    if ((valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null)) {
       return false;
     }
     if (!Arrays.equals(valueIntArray, that.valueIntArray)) {
@@ -601,13 +601,13 @@ public boolean equals(Object o) {
     if (!Arrays.equals(valueObjectArray, that.valueObjectArray)) {
       return false;
     }
-    if (valueString != null ? !valueString.equals(that.valueString) : that.valueString != null) {
+    if ((valueString != null ? !valueString.equals(that.valueString) : that.valueString != null)) {
       return false;
     }
-    if (valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null) {
+    if ((valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null)) {
       return false;
     }
-    if (valueList != null ? !valueList.equals(that.valueList) : that.valueList != null) {
+    if ((valueList != null ? !valueList.equals(that.valueList) : that.valueList != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/DefaultPackageLayoutPatternViewModel_.java b/epoxy-processortest/src/test/resources/DefaultPackageLayoutPatternViewModel_.java
index cd4c50f694..b10be892ae 100644
--- a/epoxy-processortest/src/test/resources/DefaultPackageLayoutPatternViewModel_.java
+++ b/epoxy-processortest/src/test/resources/DefaultPackageLayoutPatternViewModel_.java
@@ -180,10 +180,10 @@ public boolean equals(Object o) {
       return false;
     }
     DefaultPackageLayoutPatternViewModel_ that = (DefaultPackageLayoutPatternViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/DoNotHashViewModel_.java b/epoxy-processortest/src/test/resources/DoNotHashViewModel_.java
index 264e5984d2..4d0df25300 100644
--- a/epoxy-processortest/src/test/resources/DoNotHashViewModel_.java
+++ b/epoxy-processortest/src/test/resources/DoNotHashViewModel_.java
@@ -78,15 +78,15 @@ public void bind(final DoNotHashView object, EpoxyModel previousModel) {
     DoNotHashViewModel_ that = (DoNotHashViewModel_) previousModel;
     super.bind(object);
 
-    if ((clickListener_OnClickListener == null) != (that.clickListener_OnClickListener == null)) {
+    if (((clickListener_OnClickListener == null) != (that.clickListener_OnClickListener == null))) {
       object.setClickListener(clickListener_OnClickListener);
     }
 
-    if ((title_CharSequence == null) != (that.title_CharSequence == null)) {
+    if (((title_CharSequence == null) != (that.title_CharSequence == null))) {
       object.setTitle(title_CharSequence);
     }
 
-    if (normalProp_CharSequence != null ? !normalProp_CharSequence.equals(that.normalProp_CharSequence) : that.normalProp_CharSequence != null) {
+    if ((normalProp_CharSequence != null ? !normalProp_CharSequence.equals(that.normalProp_CharSequence) : that.normalProp_CharSequence != null)) {
       object.normalProp(normalProp_CharSequence);
     }
   }
@@ -304,19 +304,19 @@ public boolean equals(Object o) {
       return false;
     }
     DoNotHashViewModel_ that = (DoNotHashViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((title_CharSequence == null) != (that.title_CharSequence == null)) {
+    if (((title_CharSequence == null) != (that.title_CharSequence == null))) {
       return false;
     }
-    if ((clickListener_OnClickListener == null) != (that.clickListener_OnClickListener == null)) {
+    if (((clickListener_OnClickListener == null) != (that.clickListener_OnClickListener == null))) {
       return false;
     }
-    if (normalProp_CharSequence != null ? !normalProp_CharSequence.equals(that.normalProp_CharSequence) : that.normalProp_CharSequence != null) {
+    if ((normalProp_CharSequence != null ? !normalProp_CharSequence.equals(that.normalProp_CharSequence) : that.normalProp_CharSequence != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$NoLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$NoLayout_.java
index 9830612959..559d8236f3 100755
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$NoLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$NoLayout_.java
@@ -176,13 +176,13 @@ public boolean equals(Object o) {
       return false;
     }
     GenerateDefaultLayoutMethodNextParentLayout$NoLayout_ that = (GenerateDefaultLayoutMethodNextParentLayout$NoLayout_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_.java
index 40980078fe..68d18d6094 100755
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_.java
@@ -165,10 +165,10 @@ public boolean equals(Object o) {
       return false;
     }
     GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_ that = (GenerateDefaultLayoutMethodNextParentLayout$StillNoLayout_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$WithLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$WithLayout_.java
index 9cd1587699..9ffea8b725 100755
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$WithLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodNextParentLayout$WithLayout_.java
@@ -165,10 +165,10 @@ public boolean equals(Object o) {
       return false;
     }
     GenerateDefaultLayoutMethodNextParentLayout$WithLayout_ that = (GenerateDefaultLayoutMethodNextParentLayout$WithLayout_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$NoLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$NoLayout_.java
index a92b55e9c5..c24941755f 100755
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$NoLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$NoLayout_.java
@@ -176,13 +176,13 @@ public boolean equals(Object o) {
       return false;
     }
     GenerateDefaultLayoutMethodParentLayout$NoLayout_ that = (GenerateDefaultLayoutMethodParentLayout$NoLayout_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$WithLayout_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$WithLayout_.java
index faa5752260..394b4372c6 100755
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$WithLayout_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethodParentLayout$WithLayout_.java
@@ -165,10 +165,10 @@ public boolean equals(Object o) {
       return false;
     }
     GenerateDefaultLayoutMethodParentLayout$WithLayout_ that = (GenerateDefaultLayoutMethodParentLayout$WithLayout_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethod_.java b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethod_.java
index d9b60e659e..6ec20ac2b1 100755
--- a/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethod_.java
+++ b/epoxy-processortest/src/test/resources/GenerateDefaultLayoutMethod_.java
@@ -175,13 +175,13 @@ public boolean equals(Object o) {
       return false;
     }
     GenerateDefaultLayoutMethod_ that = (GenerateDefaultLayoutMethod_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/GridSpanCountViewModel_.java b/epoxy-processortest/src/test/resources/GridSpanCountViewModel_.java
index 00b1f707fd..e99dd88df8 100644
--- a/epoxy-processortest/src/test/resources/GridSpanCountViewModel_.java
+++ b/epoxy-processortest/src/test/resources/GridSpanCountViewModel_.java
@@ -56,7 +56,7 @@ public void bind(final GridSpanCountView object, EpoxyModel previousModel) {
     GridSpanCountViewModel_ that = (GridSpanCountViewModel_) previousModel;
     super.bind(object);
 
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       object.setClickListener(clickListener_String);
     }
   }
@@ -217,13 +217,13 @@ public boolean equals(Object o) {
       return false;
     }
     GridSpanCountViewModel_ that = (GridSpanCountViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/IgnoreRequireHashCodeViewModel_.java b/epoxy-processortest/src/test/resources/IgnoreRequireHashCodeViewModel_.java
index da4a80e42c..95fc77a462 100644
--- a/epoxy-processortest/src/test/resources/IgnoreRequireHashCodeViewModel_.java
+++ b/epoxy-processortest/src/test/resources/IgnoreRequireHashCodeViewModel_.java
@@ -60,7 +60,7 @@ public void bind(final IgnoreRequireHashCodeView object, EpoxyModel previousMode
     IgnoreRequireHashCodeViewModel_ that = (IgnoreRequireHashCodeViewModel_) previousModel;
     super.bind(object);
 
-    if (clickListener_OnClickListener != null ? !clickListener_OnClickListener.equals(that.clickListener_OnClickListener) : that.clickListener_OnClickListener != null) {
+    if ((clickListener_OnClickListener != null ? !clickListener_OnClickListener.equals(that.clickListener_OnClickListener) : that.clickListener_OnClickListener != null)) {
       object.setClickListener(clickListener_OnClickListener);
     }
   }
@@ -236,13 +236,13 @@ public boolean equals(Object o) {
       return false;
     }
     IgnoreRequireHashCodeViewModel_ that = (IgnoreRequireHashCodeViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (clickListener_OnClickListener != null ? !clickListener_OnClickListener.equals(that.clickListener_OnClickListener) : that.clickListener_OnClickListener != null) {
+    if ((clickListener_OnClickListener != null ? !clickListener_OnClickListener.equals(that.clickListener_OnClickListener) : that.clickListener_OnClickListener != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/LayoutOverloadsViewModel_.java b/epoxy-processortest/src/test/resources/LayoutOverloadsViewModel_.java
index 1a9a286c8f..9bb750ee19 100644
--- a/epoxy-processortest/src/test/resources/LayoutOverloadsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/LayoutOverloadsViewModel_.java
@@ -190,10 +190,10 @@ public boolean equals(Object o) {
       return false;
     }
     LayoutOverloadsViewModel_ that = (LayoutOverloadsViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelDoNotHash_.java b/epoxy-processortest/src/test/resources/ModelDoNotHash_.java
index ca252f50fb..11956c0cf8 100644
--- a/epoxy-processortest/src/test/resources/ModelDoNotHash_.java
+++ b/epoxy-processortest/src/test/resources/ModelDoNotHash_.java
@@ -191,16 +191,16 @@ public boolean equals(Object o) {
       return false;
     }
     ModelDoNotHash_ that = (ModelDoNotHash_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
-    if ((value3 == null) != (that.value3 == null)) {
+    if (((value3 == null) != (that.value3 == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelDoNotUseInToString_.java b/epoxy-processortest/src/test/resources/ModelDoNotUseInToString_.java
index ac280af39f..81c8c46e77 100644
--- a/epoxy-processortest/src/test/resources/ModelDoNotUseInToString_.java
+++ b/epoxy-processortest/src/test/resources/ModelDoNotUseInToString_.java
@@ -191,19 +191,19 @@ public boolean equals(Object o) {
       return false;
     }
     ModelDoNotUseInToString_ that = (ModelDoNotUseInToString_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
-    if (value2 != that.value2) {
+    if ((value2 != that.value2)) {
       return false;
     }
-    if (value3 != null ? !value3.equals(that.value3) : that.value3 != null) {
+    if ((value3 != null ? !value3.equals(that.value3) : that.value3 != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelForRProcessingTest_.java b/epoxy-processortest/src/test/resources/ModelForRProcessingTest_.java
index d2161ce52a..779500cdc5 100755
--- a/epoxy-processortest/src/test/resources/ModelForRProcessingTest_.java
+++ b/epoxy-processortest/src/test/resources/ModelForRProcessingTest_.java
@@ -175,13 +175,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelForRProcessingTest_ that = (ModelForRProcessingTest_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelForTestingDuplicateRValues_.java b/epoxy-processortest/src/test/resources/ModelForTestingDuplicateRValues_.java
index 999fdcddc5..d9d65a5275 100644
--- a/epoxy-processortest/src/test/resources/ModelForTestingDuplicateRValues_.java
+++ b/epoxy-processortest/src/test/resources/ModelForTestingDuplicateRValues_.java
@@ -176,13 +176,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelForTestingDuplicateRValues_ that = (ModelForTestingDuplicateRValues_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelNoValidation_.java b/epoxy-processortest/src/test/resources/ModelNoValidation_.java
index a077fadc1d..dbecc1f4b8 100644
--- a/epoxy-processortest/src/test/resources/ModelNoValidation_.java
+++ b/epoxy-processortest/src/test/resources/ModelNoValidation_.java
@@ -161,13 +161,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelNoValidation_ that = (ModelNoValidation_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelReturningClassTypeWithVarargs_.java b/epoxy-processortest/src/test/resources/ModelReturningClassTypeWithVarargs_.java
index 0280c5493c..229c3365be 100755
--- a/epoxy-processortest/src/test/resources/ModelReturningClassTypeWithVarargs_.java
+++ b/epoxy-processortest/src/test/resources/ModelReturningClassTypeWithVarargs_.java
@@ -181,13 +181,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelReturningClassTypeWithVarargs_ that = (ModelReturningClassTypeWithVarargs_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelReturningClassType_.java b/epoxy-processortest/src/test/resources/ModelReturningClassType_.java
index 1e8f044c56..b0d2d21ea8 100755
--- a/epoxy-processortest/src/test/resources/ModelReturningClassType_.java
+++ b/epoxy-processortest/src/test/resources/ModelReturningClassType_.java
@@ -188,13 +188,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelReturningClassType_ that = (ModelReturningClassType_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelViewExtendingSuperClassModel_.java b/epoxy-processortest/src/test/resources/ModelViewExtendingSuperClassModel_.java
index 7bfef8318d..110df472ce 100644
--- a/epoxy-processortest/src/test/resources/ModelViewExtendingSuperClassModel_.java
+++ b/epoxy-processortest/src/test/resources/ModelViewExtendingSuperClassModel_.java
@@ -68,11 +68,11 @@ public void bind(final ModelViewExtendingSuperClass object, EpoxyModel previousM
     ModelViewExtendingSuperClassModel_ that = (ModelViewExtendingSuperClassModel_) previousModel;
     super.bind(object);
 
-    if (subClassValue_Int != that.subClassValue_Int) {
+    if ((subClassValue_Int != that.subClassValue_Int)) {
       object.subClassValue(subClassValue_Int);
     }
 
-    if (superClassValue_Int != that.superClassValue_Int) {
+    if ((superClassValue_Int != that.superClassValue_Int)) {
       object.superClassValue(superClassValue_Int);
     }
   }
@@ -249,16 +249,16 @@ public boolean equals(Object o) {
       return false;
     }
     ModelViewExtendingSuperClassModel_ that = (ModelViewExtendingSuperClassModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (subClassValue_Int != that.subClassValue_Int) {
+    if ((subClassValue_Int != that.subClassValue_Int)) {
       return false;
     }
-    if (superClassValue_Int != that.superClassValue_Int) {
+    if ((superClassValue_Int != that.superClassValue_Int)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelViewSuperClassModel_.java b/epoxy-processortest/src/test/resources/ModelViewSuperClassModel_.java
index b634dc64e8..48c8c77020 100644
--- a/epoxy-processortest/src/test/resources/ModelViewSuperClassModel_.java
+++ b/epoxy-processortest/src/test/resources/ModelViewSuperClassModel_.java
@@ -63,7 +63,7 @@ public void bind(final ModelViewSuperClass object, EpoxyModel previousModel) {
     ModelViewSuperClassModel_ that = (ModelViewSuperClassModel_) previousModel;
     super.bind(object);
 
-    if (superClassValue_Int != that.superClassValue_Int) {
+    if ((superClassValue_Int != that.superClassValue_Int)) {
       object.superClassValue(superClassValue_Int);
     }
   }
@@ -221,13 +221,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelViewSuperClassModel_ that = (ModelViewSuperClassModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (superClassValue_Int != that.superClassValue_Int) {
+    if ((superClassValue_Int != that.superClassValue_Int)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithAbstractClassAndAnnotation_.java b/epoxy-processortest/src/test/resources/ModelWithAbstractClassAndAnnotation_.java
index d08d51172e..0f28bcd32b 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAbstractClassAndAnnotation_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAbstractClassAndAnnotation_.java
@@ -158,10 +158,10 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithAbstractClassAndAnnotation_ that = (ModelWithAbstractClassAndAnnotation_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithAllFieldTypes_.java b/epoxy-processortest/src/test/resources/ModelWithAllFieldTypes_.java
index fae2e53729..b295c58761 100755
--- a/epoxy-processortest/src/test/resources/ModelWithAllFieldTypes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAllFieldTypes_.java
@@ -399,58 +399,58 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithAllFieldTypes_ that = (ModelWithAllFieldTypes_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       return false;
     }
-    if (valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null) {
+    if ((valueInteger != null ? !valueInteger.equals(that.valueInteger) : that.valueInteger != null)) {
       return false;
     }
-    if (valueShort != that.valueShort) {
+    if ((valueShort != that.valueShort)) {
       return false;
     }
-    if (valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null) {
+    if ((valueShortWrapper != null ? !valueShortWrapper.equals(that.valueShortWrapper) : that.valueShortWrapper != null)) {
       return false;
     }
-    if (valueChar != that.valueChar) {
+    if ((valueChar != that.valueChar)) {
       return false;
     }
-    if (valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null) {
+    if ((valueCharacter != null ? !valueCharacter.equals(that.valueCharacter) : that.valueCharacter != null)) {
       return false;
     }
-    if (valuebByte != that.valuebByte) {
+    if ((valuebByte != that.valuebByte)) {
       return false;
     }
-    if (valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null) {
+    if ((valueByteWrapper != null ? !valueByteWrapper.equals(that.valueByteWrapper) : that.valueByteWrapper != null)) {
       return false;
     }
-    if (valueLong != that.valueLong) {
+    if ((valueLong != that.valueLong)) {
       return false;
     }
-    if (valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null) {
+    if ((valueLongWrapper != null ? !valueLongWrapper.equals(that.valueLongWrapper) : that.valueLongWrapper != null)) {
       return false;
     }
-    if (Double.compare(that.valueDouble, valueDouble) != 0) {
+    if ((Double.compare(that.valueDouble, valueDouble) != 0)) {
       return false;
     }
-    if (valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null) {
+    if ((valueDoubleWrapper != null ? !valueDoubleWrapper.equals(that.valueDoubleWrapper) : that.valueDoubleWrapper != null)) {
       return false;
     }
-    if (Float.compare(that.valueFloat, valueFloat) != 0) {
+    if ((Float.compare(that.valueFloat, valueFloat) != 0)) {
       return false;
     }
-    if (valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null) {
+    if ((valueFloatWrapper != null ? !valueFloatWrapper.equals(that.valueFloatWrapper) : that.valueFloatWrapper != null)) {
       return false;
     }
-    if (valueBoolean != that.valueBoolean) {
+    if ((valueBoolean != that.valueBoolean)) {
       return false;
     }
-    if (valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null) {
+    if ((valueBooleanWrapper != null ? !valueBooleanWrapper.equals(that.valueBooleanWrapper) : that.valueBooleanWrapper != null)) {
       return false;
     }
     if (!Arrays.equals(valueIntArray, that.valueIntArray)) {
@@ -459,13 +459,13 @@ public boolean equals(Object o) {
     if (!Arrays.equals(valueObjectArray, that.valueObjectArray)) {
       return false;
     }
-    if (valueString != null ? !valueString.equals(that.valueString) : that.valueString != null) {
+    if ((valueString != null ? !valueString.equals(that.valueString) : that.valueString != null)) {
       return false;
     }
-    if (valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null) {
+    if ((valueObject != null ? !valueObject.equals(that.valueObject) : that.valueObject != null)) {
       return false;
     }
-    if (valueList != null ? !valueList.equals(that.valueList) : that.valueList != null) {
+    if ((valueList != null ? !valueList.equals(that.valueList) : that.valueList != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithAllPrivateFieldTypes_.java b/epoxy-processortest/src/test/resources/ModelWithAllPrivateFieldTypes_.java
index 3f74f5299b..ad77ddb0be 100755
--- a/epoxy-processortest/src/test/resources/ModelWithAllPrivateFieldTypes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAllPrivateFieldTypes_.java
@@ -405,58 +405,58 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithAllPrivateFieldTypes_ that = (ModelWithAllPrivateFieldTypes_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (getValueInt() != that.getValueInt()) {
+    if ((getValueInt() != that.getValueInt())) {
       return false;
     }
-    if (getValueInteger() != null ? !getValueInteger().equals(that.getValueInteger()) : that.getValueInteger() != null) {
+    if ((getValueInteger() != null ? !getValueInteger().equals(that.getValueInteger()) : that.getValueInteger() != null)) {
       return false;
     }
-    if (getValueShort() != that.getValueShort()) {
+    if ((getValueShort() != that.getValueShort())) {
       return false;
     }
-    if (getValueShortWrapper() != null ? !getValueShortWrapper().equals(that.getValueShortWrapper()) : that.getValueShortWrapper() != null) {
+    if ((getValueShortWrapper() != null ? !getValueShortWrapper().equals(that.getValueShortWrapper()) : that.getValueShortWrapper() != null)) {
       return false;
     }
-    if (getValueChar() != that.getValueChar()) {
+    if ((getValueChar() != that.getValueChar())) {
       return false;
     }
-    if (getValueCharacter() != null ? !getValueCharacter().equals(that.getValueCharacter()) : that.getValueCharacter() != null) {
+    if ((getValueCharacter() != null ? !getValueCharacter().equals(that.getValueCharacter()) : that.getValueCharacter() != null)) {
       return false;
     }
-    if (getValuebByte() != that.getValuebByte()) {
+    if ((getValuebByte() != that.getValuebByte())) {
       return false;
     }
-    if (getValueByteWrapper() != null ? !getValueByteWrapper().equals(that.getValueByteWrapper()) : that.getValueByteWrapper() != null) {
+    if ((getValueByteWrapper() != null ? !getValueByteWrapper().equals(that.getValueByteWrapper()) : that.getValueByteWrapper() != null)) {
       return false;
     }
-    if (getValueLong() != that.getValueLong()) {
+    if ((getValueLong() != that.getValueLong())) {
       return false;
     }
-    if (getValueLongWrapper() != null ? !getValueLongWrapper().equals(that.getValueLongWrapper()) : that.getValueLongWrapper() != null) {
+    if ((getValueLongWrapper() != null ? !getValueLongWrapper().equals(that.getValueLongWrapper()) : that.getValueLongWrapper() != null)) {
       return false;
     }
-    if (Double.compare(that.getValueDouble(), getValueDouble()) != 0) {
+    if ((Double.compare(that.getValueDouble(), getValueDouble()) != 0)) {
       return false;
     }
-    if (getValueDoubleWrapper() != null ? !getValueDoubleWrapper().equals(that.getValueDoubleWrapper()) : that.getValueDoubleWrapper() != null) {
+    if ((getValueDoubleWrapper() != null ? !getValueDoubleWrapper().equals(that.getValueDoubleWrapper()) : that.getValueDoubleWrapper() != null)) {
       return false;
     }
-    if (Float.compare(that.getValueFloat(), getValueFloat()) != 0) {
+    if ((Float.compare(that.getValueFloat(), getValueFloat()) != 0)) {
       return false;
     }
-    if (getValueFloatWrapper() != null ? !getValueFloatWrapper().equals(that.getValueFloatWrapper()) : that.getValueFloatWrapper() != null) {
+    if ((getValueFloatWrapper() != null ? !getValueFloatWrapper().equals(that.getValueFloatWrapper()) : that.getValueFloatWrapper() != null)) {
       return false;
     }
-    if (isValueBoolean() != that.isValueBoolean()) {
+    if ((isValueBoolean() != that.isValueBoolean())) {
       return false;
     }
-    if (getValueBooleanWrapper() != null ? !getValueBooleanWrapper().equals(that.getValueBooleanWrapper()) : that.getValueBooleanWrapper() != null) {
+    if ((getValueBooleanWrapper() != null ? !getValueBooleanWrapper().equals(that.getValueBooleanWrapper()) : that.getValueBooleanWrapper() != null)) {
       return false;
     }
     if (!Arrays.equals(getValueIntArray(), that.getValueIntArray())) {
@@ -465,13 +465,13 @@ public boolean equals(Object o) {
     if (!Arrays.equals(getValueObjectArray(), that.getValueObjectArray())) {
       return false;
     }
-    if (getValueString() != null ? !getValueString().equals(that.getValueString()) : that.getValueString() != null) {
+    if ((getValueString() != null ? !getValueString().equals(that.getValueString()) : that.getValueString() != null)) {
       return false;
     }
-    if (getValueObject() != null ? !getValueObject().equals(that.getValueObject()) : that.getValueObject() != null) {
+    if ((getValueObject() != null ? !getValueObject().equals(that.getValueObject()) : that.getValueObject() != null)) {
       return false;
     }
-    if (getValueList() != null ? !getValueList().equals(that.getValueList()) : that.getValueList() != null) {
+    if ((getValueList() != null ? !getValueList().equals(that.getValueList()) : that.getValueList() != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_.java b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_.java
index 6a762dc863..ab5c0f4733 100755
--- a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_.java
@@ -172,13 +172,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_ that = (ModelWithAnnotatedClassAndSuperAttributes$SubModelWithAnnotatedClassAndSuperAttributes_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (superValue != that.superValue) {
+    if ((superValue != that.superValue)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes_.java b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes_.java
index e3542f6e70..b7fe8b4849 100644
--- a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClassAndSuperAttributes_.java
@@ -170,13 +170,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithAnnotatedClassAndSuperAttributes_ that = (ModelWithAnnotatedClassAndSuperAttributes_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (superValue != that.superValue) {
+    if ((superValue != that.superValue)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClass_.java b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClass_.java
index e826dcbd17..a97f491854 100755
--- a/epoxy-processortest/src/test/resources/ModelWithAnnotatedClass_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAnnotatedClass_.java
@@ -158,10 +158,10 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithAnnotatedClass_ that = (ModelWithAnnotatedClass_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithAnnotation_.java b/epoxy-processortest/src/test/resources/ModelWithAnnotation_.java
index 8d39e44adb..d1826cb7bc 100755
--- a/epoxy-processortest/src/test/resources/ModelWithAnnotation_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithAnnotation_.java
@@ -160,10 +160,10 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithAnnotation_ that = (ModelWithAnnotation_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithConstructors_.java b/epoxy-processortest/src/test/resources/ModelWithConstructors_.java
index 36c52d1074..864def3812 100755
--- a/epoxy-processortest/src/test/resources/ModelWithConstructors_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithConstructors_.java
@@ -177,13 +177,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithConstructors_ that = (ModelWithConstructors_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithDataBindingBindingModel_.java b/epoxy-processortest/src/test/resources/ModelWithDataBindingBindingModel_.java
index c66f8db7dc..29044323d4 100755
--- a/epoxy-processortest/src/test/resources/ModelWithDataBindingBindingModel_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithDataBindingBindingModel_.java
@@ -169,7 +169,7 @@ protected void setDataBindingVariables(ViewDataBinding binding, EpoxyModel previ
       return;
     }
     ModelWithDataBindingBindingModel_ that = (ModelWithDataBindingBindingModel_) previousModel;
-    if (stringValue != null ? !stringValue.equals(that.stringValue) : that.stringValue != null) {
+    if ((stringValue != null ? !stringValue.equals(that.stringValue) : that.stringValue != null)) {
       binding.setVariable(BR.stringValue, stringValue);
     }
   }
@@ -195,13 +195,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithDataBindingBindingModel_ that = (ModelWithDataBindingBindingModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (stringValue != null ? !stringValue.equals(that.stringValue) : that.stringValue != null) {
+    if ((stringValue != null ? !stringValue.equals(that.stringValue) : that.stringValue != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithFieldAnnotation_.java b/epoxy-processortest/src/test/resources/ModelWithFieldAnnotation_.java
index f2b4423434..34ef98ad82 100755
--- a/epoxy-processortest/src/test/resources/ModelWithFieldAnnotation_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithFieldAnnotation_.java
@@ -170,13 +170,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithFieldAnnotation_ that = (ModelWithFieldAnnotation_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (title != null ? !title.equals(that.title) : that.title != null) {
+    if ((title != null ? !title.equals(that.title) : that.title != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithFinalField_.java b/epoxy-processortest/src/test/resources/ModelWithFinalField_.java
index e5b46f5d54..9529ba4906 100755
--- a/epoxy-processortest/src/test/resources/ModelWithFinalField_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithFinalField_.java
@@ -162,13 +162,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithFinalField_ that = (ModelWithFinalField_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithIntDef_.java b/epoxy-processortest/src/test/resources/ModelWithIntDef_.java
index 9791efd10d..dabc69f109 100644
--- a/epoxy-processortest/src/test/resources/ModelWithIntDef_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithIntDef_.java
@@ -176,13 +176,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithIntDef_ that = (ModelWithIntDef_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (type != that.type) {
+    if ((type != that.type)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_.java b/epoxy-processortest/src/test/resources/ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_.java
index faca165a6d..7b8be29626 100755
--- a/epoxy-processortest/src/test/resources/ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_.java
@@ -170,13 +170,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_ that = (ModelWithPrivateFieldWithSameAsFieldGetterAndSetterName_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (isValue() != that.isValue()) {
+    if ((isValue() != that.isValue())) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithPrivateViewClickListener_.java b/epoxy-processortest/src/test/resources/ModelWithPrivateViewClickListener_.java
index 18f0f200d6..a23bab4de7 100644
--- a/epoxy-processortest/src/test/resources/ModelWithPrivateViewClickListener_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithPrivateViewClickListener_.java
@@ -186,13 +186,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithPrivateViewClickListener_ that = (ModelWithPrivateViewClickListener_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((getClickListener() == null) != (that.getClickListener() == null)) {
+    if (((getClickListener() == null) != (that.getClickListener() == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithSuperAttributes$SubModelWithSuperAttributes_.java b/epoxy-processortest/src/test/resources/ModelWithSuperAttributes$SubModelWithSuperAttributes_.java
index 647f6b51b1..e1da9cc812 100755
--- a/epoxy-processortest/src/test/resources/ModelWithSuperAttributes$SubModelWithSuperAttributes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithSuperAttributes$SubModelWithSuperAttributes_.java
@@ -181,16 +181,16 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithSuperAttributes$SubModelWithSuperAttributes_ that = (ModelWithSuperAttributes$SubModelWithSuperAttributes_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (subValue != that.subValue) {
+    if ((subValue != that.subValue)) {
       return false;
     }
-    if (superValue != that.superValue) {
+    if ((superValue != that.superValue)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithSuperAttributes_.java b/epoxy-processortest/src/test/resources/ModelWithSuperAttributes_.java
index a9c9167223..81955d1f81 100755
--- a/epoxy-processortest/src/test/resources/ModelWithSuperAttributes_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithSuperAttributes_.java
@@ -169,13 +169,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithSuperAttributes_ that = (ModelWithSuperAttributes_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (superValue != that.superValue) {
+    if ((superValue != that.superValue)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithSuper_.java b/epoxy-processortest/src/test/resources/ModelWithSuper_.java
index 251cc15786..e3291b2bef 100755
--- a/epoxy-processortest/src/test/resources/ModelWithSuper_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithSuper_.java
@@ -170,13 +170,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithSuper_ that = (ModelWithSuper_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithType_.java b/epoxy-processortest/src/test/resources/ModelWithType_.java
index 743576e0e4..5ff8ee6a35 100755
--- a/epoxy-processortest/src/test/resources/ModelWithType_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithType_.java
@@ -169,13 +169,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithType_ that = (ModelWithType_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithVarargsConstructors_.java b/epoxy-processortest/src/test/resources/ModelWithVarargsConstructors_.java
index a9e757d7d2..750820ee5b 100755
--- a/epoxy-processortest/src/test/resources/ModelWithVarargsConstructors_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithVarargsConstructors_.java
@@ -185,13 +185,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithVarargsConstructors_ that = (ModelWithVarargsConstructors_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (valueInt != that.valueInt) {
+    if ((valueInt != that.valueInt)) {
       return false;
     }
     if (!Arrays.equals(varargs, that.varargs)) {
diff --git a/epoxy-processortest/src/test/resources/ModelWithViewClickListener_.java b/epoxy-processortest/src/test/resources/ModelWithViewClickListener_.java
index 7bb6febb09..c1ad379628 100644
--- a/epoxy-processortest/src/test/resources/ModelWithViewClickListener_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithViewClickListener_.java
@@ -186,13 +186,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithViewClickListener_ that = (ModelWithViewClickListener_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((clickListener == null) != (that.clickListener == null)) {
+    if (((clickListener == null) != (that.clickListener == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithViewLongClickListener_.java b/epoxy-processortest/src/test/resources/ModelWithViewLongClickListener_.java
index 84d1858314..39c08fc8c1 100644
--- a/epoxy-processortest/src/test/resources/ModelWithViewLongClickListener_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithViewLongClickListener_.java
@@ -186,13 +186,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithViewLongClickListener_ that = (ModelWithViewLongClickListener_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((clickListener == null) != (that.clickListener == null)) {
+    if (((clickListener == null) != (that.clickListener == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithoutHash_.java b/epoxy-processortest/src/test/resources/ModelWithoutHash_.java
index 9cc19a707a..3006b07b3a 100644
--- a/epoxy-processortest/src/test/resources/ModelWithoutHash_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithoutHash_.java
@@ -191,16 +191,16 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithoutHash_ that = (ModelWithoutHash_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
-    if ((value3 == null) != (that.value3 == null)) {
+    if (((value3 == null) != (that.value3 == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/ModelWithoutSetter_.java b/epoxy-processortest/src/test/resources/ModelWithoutSetter_.java
index 1fd1b27eab..23cda28dc8 100755
--- a/epoxy-processortest/src/test/resources/ModelWithoutSetter_.java
+++ b/epoxy-processortest/src/test/resources/ModelWithoutSetter_.java
@@ -163,13 +163,13 @@ public boolean equals(Object o) {
       return false;
     }
     ModelWithoutSetter_ that = (ModelWithoutSetter_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (value != that.value) {
+    if ((value != that.value)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/NullOnRecycleViewModel_.java b/epoxy-processortest/src/test/resources/NullOnRecycleViewModel_.java
index 3703d0646a..569af4631f 100644
--- a/epoxy-processortest/src/test/resources/NullOnRecycleViewModel_.java
+++ b/epoxy-processortest/src/test/resources/NullOnRecycleViewModel_.java
@@ -50,7 +50,7 @@ public void bind(final NullOnRecycleView object, EpoxyModel previousModel) {
     NullOnRecycleViewModel_ that = (NullOnRecycleViewModel_) previousModel;
     super.bind(object);
 
-    if (title_CharSequence != null ? !title_CharSequence.equals(that.title_CharSequence) : that.title_CharSequence != null) {
+    if ((title_CharSequence != null ? !title_CharSequence.equals(that.title_CharSequence) : that.title_CharSequence != null)) {
       object.setTitle(title_CharSequence);
     }
   }
@@ -82,7 +82,7 @@ public void unbind(NullOnRecycleView object) {
     if (onModelUnboundListener_epoxyGeneratedModel != null) {
       onModelUnboundListener_epoxyGeneratedModel.onModelUnbound(this, object);
     }
-    object.setTitle(null);
+    object.setTitle((CharSequence) null);
   }
 
   /**
@@ -209,13 +209,13 @@ public boolean equals(Object o) {
       return false;
     }
     NullOnRecycleViewModel_ that = (NullOnRecycleViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (title_CharSequence != null ? !title_CharSequence.equals(that.title_CharSequence) : that.title_CharSequence != null) {
+    if ((title_CharSequence != null ? !title_CharSequence.equals(that.title_CharSequence) : that.title_CharSequence != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/OnViewRecycledViewModel_.java b/epoxy-processortest/src/test/resources/OnViewRecycledViewModel_.java
index 3e366c9c8c..eb1b9b8f6f 100644
--- a/epoxy-processortest/src/test/resources/OnViewRecycledViewModel_.java
+++ b/epoxy-processortest/src/test/resources/OnViewRecycledViewModel_.java
@@ -56,7 +56,7 @@ public void bind(final OnViewRecycledView object, EpoxyModel previousModel) {
     OnViewRecycledViewModel_ that = (OnViewRecycledViewModel_) previousModel;
     super.bind(object);
 
-    if (title_CharSequence != null ? !title_CharSequence.equals(that.title_CharSequence) : that.title_CharSequence != null) {
+    if ((title_CharSequence != null ? !title_CharSequence.equals(that.title_CharSequence) : that.title_CharSequence != null)) {
       object.setTitle(title_CharSequence);
     }
   }
@@ -219,13 +219,13 @@ public boolean equals(Object o) {
       return false;
     }
     OnViewRecycledViewModel_ that = (OnViewRecycledViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (title_CharSequence != null ? !title_CharSequence.equals(that.title_CharSequence) : that.title_CharSequence != null) {
+    if ((title_CharSequence != null ? !title_CharSequence.equals(that.title_CharSequence) : that.title_CharSequence != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/PropDefaultsViewModel_.java b/epoxy-processortest/src/test/resources/PropDefaultsViewModel_.java
index 22346abba9..ece1c41c8c 100644
--- a/epoxy-processortest/src/test/resources/PropDefaultsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/PropDefaultsViewModel_.java
@@ -84,27 +84,27 @@ public void bind(final PropDefaultsView object, EpoxyModel previousModel) {
     PropDefaultsViewModel_ that = (PropDefaultsViewModel_) previousModel;
     super.bind(object);
 
-    if (primitiveWithExplicitDefault_Int != that.primitiveWithExplicitDefault_Int) {
+    if ((primitiveWithExplicitDefault_Int != that.primitiveWithExplicitDefault_Int)) {
       object.primitiveWithExplicitDefault(primitiveWithExplicitDefault_Int);
     }
 
-    if (defaultsToNull_CharSequence != null ? !defaultsToNull_CharSequence.equals(that.defaultsToNull_CharSequence) : that.defaultsToNull_CharSequence != null) {
+    if ((defaultsToNull_CharSequence != null ? !defaultsToNull_CharSequence.equals(that.defaultsToNull_CharSequence) : that.defaultsToNull_CharSequence != null)) {
       object.defaultsToNull(defaultsToNull_CharSequence);
     }
 
-    if (noDefaultSoItIsRequired_CharSequence != null ? !noDefaultSoItIsRequired_CharSequence.equals(that.noDefaultSoItIsRequired_CharSequence) : that.noDefaultSoItIsRequired_CharSequence != null) {
+    if ((noDefaultSoItIsRequired_CharSequence != null ? !noDefaultSoItIsRequired_CharSequence.equals(that.noDefaultSoItIsRequired_CharSequence) : that.noDefaultSoItIsRequired_CharSequence != null)) {
       object.noDefaultSoItIsRequired(noDefaultSoItIsRequired_CharSequence);
     }
 
-    if (objectWithDefaultAndNullable_String != null ? !objectWithDefaultAndNullable_String.equals(that.objectWithDefaultAndNullable_String) : that.objectWithDefaultAndNullable_String != null) {
+    if ((objectWithDefaultAndNullable_String != null ? !objectWithDefaultAndNullable_String.equals(that.objectWithDefaultAndNullable_String) : that.objectWithDefaultAndNullable_String != null)) {
       object.objectWithDefaultAndNullable(objectWithDefaultAndNullable_String);
     }
 
-    if (objectWithDefault_String != null ? !objectWithDefault_String.equals(that.objectWithDefault_String) : that.objectWithDefault_String != null) {
+    if ((objectWithDefault_String != null ? !objectWithDefault_String.equals(that.objectWithDefault_String) : that.objectWithDefault_String != null)) {
       object.objectWithDefault(objectWithDefault_String);
     }
 
-    if (primitivesHaveImplicitDefaultsAndCannotBeRequired_Int != that.primitivesHaveImplicitDefaultsAndCannotBeRequired_Int) {
+    if ((primitivesHaveImplicitDefaultsAndCannotBeRequired_Int != that.primitivesHaveImplicitDefaultsAndCannotBeRequired_Int)) {
       object.primitivesHaveImplicitDefaultsAndCannotBeRequired(primitivesHaveImplicitDefaultsAndCannotBeRequired_Int);
     }
   }
@@ -356,28 +356,28 @@ public boolean equals(Object o) {
       return false;
     }
     PropDefaultsViewModel_ that = (PropDefaultsViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (defaultsToNull_CharSequence != null ? !defaultsToNull_CharSequence.equals(that.defaultsToNull_CharSequence) : that.defaultsToNull_CharSequence != null) {
+    if ((defaultsToNull_CharSequence != null ? !defaultsToNull_CharSequence.equals(that.defaultsToNull_CharSequence) : that.defaultsToNull_CharSequence != null)) {
       return false;
     }
-    if (noDefaultSoItIsRequired_CharSequence != null ? !noDefaultSoItIsRequired_CharSequence.equals(that.noDefaultSoItIsRequired_CharSequence) : that.noDefaultSoItIsRequired_CharSequence != null) {
+    if ((noDefaultSoItIsRequired_CharSequence != null ? !noDefaultSoItIsRequired_CharSequence.equals(that.noDefaultSoItIsRequired_CharSequence) : that.noDefaultSoItIsRequired_CharSequence != null)) {
       return false;
     }
-    if (primitivesHaveImplicitDefaultsAndCannotBeRequired_Int != that.primitivesHaveImplicitDefaultsAndCannotBeRequired_Int) {
+    if ((primitivesHaveImplicitDefaultsAndCannotBeRequired_Int != that.primitivesHaveImplicitDefaultsAndCannotBeRequired_Int)) {
       return false;
     }
-    if (primitiveWithExplicitDefault_Int != that.primitiveWithExplicitDefault_Int) {
+    if ((primitiveWithExplicitDefault_Int != that.primitiveWithExplicitDefault_Int)) {
       return false;
     }
-    if (objectWithDefault_String != null ? !objectWithDefault_String.equals(that.objectWithDefault_String) : that.objectWithDefault_String != null) {
+    if ((objectWithDefault_String != null ? !objectWithDefault_String.equals(that.objectWithDefault_String) : that.objectWithDefault_String != null)) {
       return false;
     }
-    if (objectWithDefaultAndNullable_String != null ? !objectWithDefaultAndNullable_String.equals(that.objectWithDefaultAndNullable_String) : that.objectWithDefaultAndNullable_String != null) {
+    if ((objectWithDefaultAndNullable_String != null ? !objectWithDefaultAndNullable_String.equals(that.objectWithDefaultAndNullable_String) : that.objectWithDefaultAndNullable_String != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/PropGroupsViewModel_.java b/epoxy-processortest/src/test/resources/PropGroupsViewModel_.java
index bdfa281545..d919f33095 100644
--- a/epoxy-processortest/src/test/resources/PropGroupsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/PropGroupsViewModel_.java
@@ -108,7 +108,7 @@ else if (assignedAttributes_epoxyGeneratedModel.get(5)) {
       object.setPrimitive(primitive_Long);
     }
     else {
-      object.setPrimitive(0);
+      object.setPrimitive(primitive_Int);
     }
     if (assignedAttributes_epoxyGeneratedModel.get(12)) {
       object.requiredGroup(requiredGroup_String);
@@ -123,7 +123,7 @@ else if (assignedAttributes_epoxyGeneratedModel.get(9)) {
       object.primitiveAndObjectGroupWithPrimitiveDefault(primitiveAndObjectGroupWithPrimitiveDefault_CharSequence);
     }
     else {
-      object.primitiveAndObjectGroupWithPrimitiveDefault(PropGroupsView.DEFAULT_PRIMITIVE);
+      object.primitiveAndObjectGroupWithPrimitiveDefault(primitiveAndObjectGroupWithPrimitiveDefault_Long);
     }
     if (assignedAttributes_epoxyGeneratedModel.get(10)) {
       object.setOneThing(oneThing_Long);
@@ -132,7 +132,7 @@ else if (assignedAttributes_epoxyGeneratedModel.get(11)) {
       object.setAnotherThing(anotherThing_CharSequence);
     }
     else {
-      object.setOneThing(0L);
+      object.setOneThing(oneThing_Long);
     }
     if (assignedAttributes_epoxyGeneratedModel.get(0)) {
       object.setSomething(something_CharSequence);
@@ -141,7 +141,7 @@ else if (assignedAttributes_epoxyGeneratedModel.get(1)) {
       object.setSomething(something_Int);
     }
     else {
-      object.setSomething((CharSequence) null);
+      object.setSomething(something_CharSequence);
     }
     if (assignedAttributes_epoxyGeneratedModel.get(2)) {
       object.setSomethingElse(somethingElse_CharSequence);
@@ -150,7 +150,7 @@ else if (assignedAttributes_epoxyGeneratedModel.get(3)) {
       object.setSomethingElse(somethingElse_Int);
     }
     else {
-      object.setSomethingElse(0);
+      object.setSomethingElse(somethingElse_Int);
     }
     if (assignedAttributes_epoxyGeneratedModel.get(6)) {
       object.setPrimitiveWithDefault(primitiveWithDefault_Int);
@@ -159,7 +159,7 @@ else if (assignedAttributes_epoxyGeneratedModel.get(7)) {
       object.setPrimitiveWithDefault(primitiveWithDefault_Long);
     }
     else {
-      object.setPrimitiveWithDefault(PropGroupsView.DEFAULT_PRIMITIVE);
+      object.setPrimitiveWithDefault(primitiveWithDefault_Long);
     }
   }
 
@@ -172,169 +172,105 @@ public void bind(final PropGroupsView object, EpoxyModel previousModel) {
     PropGroupsViewModel_ that = (PropGroupsViewModel_) previousModel;
     super.bind(object);
 
-    if (assignedAttributes_epoxyGeneratedModel.equals(that.assignedAttributes_epoxyGeneratedModel)) {
-      if (assignedAttributes_epoxyGeneratedModel.get(4)) {
-        if (primitive_Int != that.primitive_Int) {
-          object.setPrimitive(primitive_Int);
-        }
-      }
-       else if (assignedAttributes_epoxyGeneratedModel.get(5)) {
-        if (primitive_Long != that.primitive_Long) {
-          object.setPrimitive(primitive_Long);
-        }
-      }
-    }
-    else {
-      if (assignedAttributes_epoxyGeneratedModel.get(4) && !that.assignedAttributes_epoxyGeneratedModel.get(4)) {
+     if (assignedAttributes_epoxyGeneratedModel.get(4)) {
+      if ((primitive_Int != that.primitive_Int)) {
         object.setPrimitive(primitive_Int);
       }
-       else if (assignedAttributes_epoxyGeneratedModel.get(5) && !that.assignedAttributes_epoxyGeneratedModel.get(5)) {
+    }
+    else if (assignedAttributes_epoxyGeneratedModel.get(5)) {
+      if ((primitive_Long != that.primitive_Long)) {
         object.setPrimitive(primitive_Long);
       }
-      else {
-        object.setPrimitive(0);
-      }
     }
-
-    if (assignedAttributes_epoxyGeneratedModel.equals(that.assignedAttributes_epoxyGeneratedModel)) {
-      if (assignedAttributes_epoxyGeneratedModel.get(12)) {
-        if (requiredGroup_String != null ? !requiredGroup_String.equals(that.requiredGroup_String) : that.requiredGroup_String != null) {
-          object.requiredGroup(requiredGroup_String);
-        }
-      }
-       else if (assignedAttributes_epoxyGeneratedModel.get(13)) {
-        if (requiredGroup_CharSequence != null ? !requiredGroup_CharSequence.equals(that.requiredGroup_CharSequence) : that.requiredGroup_CharSequence != null) {
-          object.requiredGroup(requiredGroup_CharSequence);
-        }
-      }
+    // A value was not set so we should use the default value, but we only need to set it if the previous model had a custom value set.
+    else if (that.assignedAttributes_epoxyGeneratedModel.get(4) || that.assignedAttributes_epoxyGeneratedModel.get(5)) {
+      object.setPrimitive(primitive_Int);
     }
-    else {
-      if (assignedAttributes_epoxyGeneratedModel.get(12) && !that.assignedAttributes_epoxyGeneratedModel.get(12)) {
+
+     if (assignedAttributes_epoxyGeneratedModel.get(12)) {
+      if (!that.assignedAttributes_epoxyGeneratedModel.get(12) || (requiredGroup_String != null ? !requiredGroup_String.equals(that.requiredGroup_String) : that.requiredGroup_String != null)) {
         object.requiredGroup(requiredGroup_String);
       }
-       else if (assignedAttributes_epoxyGeneratedModel.get(13) && !that.assignedAttributes_epoxyGeneratedModel.get(13)) {
+    }
+    else if (assignedAttributes_epoxyGeneratedModel.get(13)) {
+      if (!that.assignedAttributes_epoxyGeneratedModel.get(13) || (requiredGroup_CharSequence != null ? !requiredGroup_CharSequence.equals(that.requiredGroup_CharSequence) : that.requiredGroup_CharSequence != null)) {
         object.requiredGroup(requiredGroup_CharSequence);
       }
     }
 
-    if (assignedAttributes_epoxyGeneratedModel.equals(that.assignedAttributes_epoxyGeneratedModel)) {
-      if (assignedAttributes_epoxyGeneratedModel.get(8)) {
-        if (primitiveAndObjectGroupWithPrimitiveDefault_Long != that.primitiveAndObjectGroupWithPrimitiveDefault_Long) {
-          object.primitiveAndObjectGroupWithPrimitiveDefault(primitiveAndObjectGroupWithPrimitiveDefault_Long);
-        }
-      }
-       else if (assignedAttributes_epoxyGeneratedModel.get(9)) {
-        if (primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null ? !primitiveAndObjectGroupWithPrimitiveDefault_CharSequence.equals(that.primitiveAndObjectGroupWithPrimitiveDefault_CharSequence) : that.primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null) {
-          object.primitiveAndObjectGroupWithPrimitiveDefault(primitiveAndObjectGroupWithPrimitiveDefault_CharSequence);
-        }
-      }
-    }
-    else {
-      if (assignedAttributes_epoxyGeneratedModel.get(8) && !that.assignedAttributes_epoxyGeneratedModel.get(8)) {
+     if (assignedAttributes_epoxyGeneratedModel.get(8)) {
+      if ((primitiveAndObjectGroupWithPrimitiveDefault_Long != that.primitiveAndObjectGroupWithPrimitiveDefault_Long)) {
         object.primitiveAndObjectGroupWithPrimitiveDefault(primitiveAndObjectGroupWithPrimitiveDefault_Long);
       }
-       else if (assignedAttributes_epoxyGeneratedModel.get(9) && !that.assignedAttributes_epoxyGeneratedModel.get(9)) {
+    }
+    else if (assignedAttributes_epoxyGeneratedModel.get(9)) {
+      if (!that.assignedAttributes_epoxyGeneratedModel.get(9) || (primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null ? !primitiveAndObjectGroupWithPrimitiveDefault_CharSequence.equals(that.primitiveAndObjectGroupWithPrimitiveDefault_CharSequence) : that.primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null)) {
         object.primitiveAndObjectGroupWithPrimitiveDefault(primitiveAndObjectGroupWithPrimitiveDefault_CharSequence);
       }
-      else {
-        object.primitiveAndObjectGroupWithPrimitiveDefault(PropGroupsView.DEFAULT_PRIMITIVE);
-      }
     }
-
-    if (assignedAttributes_epoxyGeneratedModel.equals(that.assignedAttributes_epoxyGeneratedModel)) {
-      if (assignedAttributes_epoxyGeneratedModel.get(10)) {
-        if (oneThing_Long != that.oneThing_Long) {
-          object.setOneThing(oneThing_Long);
-        }
-      }
-       else if (assignedAttributes_epoxyGeneratedModel.get(11)) {
-        if (anotherThing_CharSequence != null ? !anotherThing_CharSequence.equals(that.anotherThing_CharSequence) : that.anotherThing_CharSequence != null) {
-          object.setAnotherThing(anotherThing_CharSequence);
-        }
-      }
+    // A value was not set so we should use the default value, but we only need to set it if the previous model had a custom value set.
+    else if (that.assignedAttributes_epoxyGeneratedModel.get(8) || that.assignedAttributes_epoxyGeneratedModel.get(9)) {
+      object.primitiveAndObjectGroupWithPrimitiveDefault(primitiveAndObjectGroupWithPrimitiveDefault_Long);
     }
-    else {
-      if (assignedAttributes_epoxyGeneratedModel.get(10) && !that.assignedAttributes_epoxyGeneratedModel.get(10)) {
+
+     if (assignedAttributes_epoxyGeneratedModel.get(10)) {
+      if ((oneThing_Long != that.oneThing_Long)) {
         object.setOneThing(oneThing_Long);
       }
-       else if (assignedAttributes_epoxyGeneratedModel.get(11) && !that.assignedAttributes_epoxyGeneratedModel.get(11)) {
+    }
+    else if (assignedAttributes_epoxyGeneratedModel.get(11)) {
+      if (!that.assignedAttributes_epoxyGeneratedModel.get(11) || (anotherThing_CharSequence != null ? !anotherThing_CharSequence.equals(that.anotherThing_CharSequence) : that.anotherThing_CharSequence != null)) {
         object.setAnotherThing(anotherThing_CharSequence);
       }
-      else {
-        object.setOneThing(0L);
-      }
     }
-
-    if (assignedAttributes_epoxyGeneratedModel.equals(that.assignedAttributes_epoxyGeneratedModel)) {
-      if (assignedAttributes_epoxyGeneratedModel.get(0)) {
-        if (something_CharSequence != null ? !something_CharSequence.equals(that.something_CharSequence) : that.something_CharSequence != null) {
-          object.setSomething(something_CharSequence);
-        }
-      }
-       else if (assignedAttributes_epoxyGeneratedModel.get(1)) {
-        if (something_Int != that.something_Int) {
-          object.setSomething(something_Int);
-        }
-      }
+    // A value was not set so we should use the default value, but we only need to set it if the previous model had a custom value set.
+    else if (that.assignedAttributes_epoxyGeneratedModel.get(10) || that.assignedAttributes_epoxyGeneratedModel.get(11)) {
+      object.setOneThing(oneThing_Long);
     }
-    else {
-      if (assignedAttributes_epoxyGeneratedModel.get(0) && !that.assignedAttributes_epoxyGeneratedModel.get(0)) {
+
+     if (assignedAttributes_epoxyGeneratedModel.get(0)) {
+      if (!that.assignedAttributes_epoxyGeneratedModel.get(0) || (something_CharSequence != null ? !something_CharSequence.equals(that.something_CharSequence) : that.something_CharSequence != null)) {
         object.setSomething(something_CharSequence);
       }
-       else if (assignedAttributes_epoxyGeneratedModel.get(1) && !that.assignedAttributes_epoxyGeneratedModel.get(1)) {
+    }
+    else if (assignedAttributes_epoxyGeneratedModel.get(1)) {
+      if ((something_Int != that.something_Int)) {
         object.setSomething(something_Int);
       }
-      else {
-        object.setSomething((CharSequence) null);
-      }
     }
-
-    if (assignedAttributes_epoxyGeneratedModel.equals(that.assignedAttributes_epoxyGeneratedModel)) {
-      if (assignedAttributes_epoxyGeneratedModel.get(2)) {
-        if (somethingElse_CharSequence != null ? !somethingElse_CharSequence.equals(that.somethingElse_CharSequence) : that.somethingElse_CharSequence != null) {
-          object.setSomethingElse(somethingElse_CharSequence);
-        }
-      }
-       else if (assignedAttributes_epoxyGeneratedModel.get(3)) {
-        if (somethingElse_Int != that.somethingElse_Int) {
-          object.setSomethingElse(somethingElse_Int);
-        }
-      }
+    // A value was not set so we should use the default value, but we only need to set it if the previous model had a custom value set.
+    else if (that.assignedAttributes_epoxyGeneratedModel.get(0) || that.assignedAttributes_epoxyGeneratedModel.get(1)) {
+      object.setSomething(something_CharSequence);
     }
-    else {
-      if (assignedAttributes_epoxyGeneratedModel.get(2) && !that.assignedAttributes_epoxyGeneratedModel.get(2)) {
+
+     if (assignedAttributes_epoxyGeneratedModel.get(2)) {
+      if (!that.assignedAttributes_epoxyGeneratedModel.get(2) || (somethingElse_CharSequence != null ? !somethingElse_CharSequence.equals(that.somethingElse_CharSequence) : that.somethingElse_CharSequence != null)) {
         object.setSomethingElse(somethingElse_CharSequence);
       }
-       else if (assignedAttributes_epoxyGeneratedModel.get(3) && !that.assignedAttributes_epoxyGeneratedModel.get(3)) {
+    }
+    else if (assignedAttributes_epoxyGeneratedModel.get(3)) {
+      if ((somethingElse_Int != that.somethingElse_Int)) {
         object.setSomethingElse(somethingElse_Int);
       }
-      else {
-        object.setSomethingElse(0);
-      }
     }
-
-    if (assignedAttributes_epoxyGeneratedModel.equals(that.assignedAttributes_epoxyGeneratedModel)) {
-      if (assignedAttributes_epoxyGeneratedModel.get(6)) {
-        if (primitiveWithDefault_Int != that.primitiveWithDefault_Int) {
-          object.setPrimitiveWithDefault(primitiveWithDefault_Int);
-        }
-      }
-       else if (assignedAttributes_epoxyGeneratedModel.get(7)) {
-        if (primitiveWithDefault_Long != that.primitiveWithDefault_Long) {
-          object.setPrimitiveWithDefault(primitiveWithDefault_Long);
-        }
-      }
+    // A value was not set so we should use the default value, but we only need to set it if the previous model had a custom value set.
+    else if (that.assignedAttributes_epoxyGeneratedModel.get(2) || that.assignedAttributes_epoxyGeneratedModel.get(3)) {
+      object.setSomethingElse(somethingElse_Int);
     }
-    else {
-      if (assignedAttributes_epoxyGeneratedModel.get(6) && !that.assignedAttributes_epoxyGeneratedModel.get(6)) {
+
+     if (assignedAttributes_epoxyGeneratedModel.get(6)) {
+      if ((primitiveWithDefault_Int != that.primitiveWithDefault_Int)) {
         object.setPrimitiveWithDefault(primitiveWithDefault_Int);
       }
-       else if (assignedAttributes_epoxyGeneratedModel.get(7) && !that.assignedAttributes_epoxyGeneratedModel.get(7)) {
+    }
+    else if (assignedAttributes_epoxyGeneratedModel.get(7)) {
+      if ((primitiveWithDefault_Long != that.primitiveWithDefault_Long)) {
         object.setPrimitiveWithDefault(primitiveWithDefault_Long);
       }
-      else {
-        object.setPrimitiveWithDefault(PropGroupsView.DEFAULT_PRIMITIVE);
-      }
+    }
+    // A value was not set so we should use the default value, but we only need to set it if the previous model had a custom value set.
+    else if (that.assignedAttributes_epoxyGeneratedModel.get(6) || that.assignedAttributes_epoxyGeneratedModel.get(7)) {
+      object.setPrimitiveWithDefault(primitiveWithDefault_Long);
     }
   }
 
@@ -760,52 +696,52 @@ public boolean equals(Object o) {
       return false;
     }
     PropGroupsViewModel_ that = (PropGroupsViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (something_CharSequence != null ? !something_CharSequence.equals(that.something_CharSequence) : that.something_CharSequence != null) {
+    if ((something_CharSequence != null ? !something_CharSequence.equals(that.something_CharSequence) : that.something_CharSequence != null)) {
       return false;
     }
-    if (something_Int != that.something_Int) {
+    if ((something_Int != that.something_Int)) {
       return false;
     }
-    if (somethingElse_CharSequence != null ? !somethingElse_CharSequence.equals(that.somethingElse_CharSequence) : that.somethingElse_CharSequence != null) {
+    if ((somethingElse_CharSequence != null ? !somethingElse_CharSequence.equals(that.somethingElse_CharSequence) : that.somethingElse_CharSequence != null)) {
       return false;
     }
-    if (somethingElse_Int != that.somethingElse_Int) {
+    if ((somethingElse_Int != that.somethingElse_Int)) {
       return false;
     }
-    if (primitive_Int != that.primitive_Int) {
+    if ((primitive_Int != that.primitive_Int)) {
       return false;
     }
-    if (primitive_Long != that.primitive_Long) {
+    if ((primitive_Long != that.primitive_Long)) {
       return false;
     }
-    if (primitiveWithDefault_Int != that.primitiveWithDefault_Int) {
+    if ((primitiveWithDefault_Int != that.primitiveWithDefault_Int)) {
       return false;
     }
-    if (primitiveWithDefault_Long != that.primitiveWithDefault_Long) {
+    if ((primitiveWithDefault_Long != that.primitiveWithDefault_Long)) {
       return false;
     }
-    if (primitiveAndObjectGroupWithPrimitiveDefault_Long != that.primitiveAndObjectGroupWithPrimitiveDefault_Long) {
+    if ((primitiveAndObjectGroupWithPrimitiveDefault_Long != that.primitiveAndObjectGroupWithPrimitiveDefault_Long)) {
       return false;
     }
-    if (primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null ? !primitiveAndObjectGroupWithPrimitiveDefault_CharSequence.equals(that.primitiveAndObjectGroupWithPrimitiveDefault_CharSequence) : that.primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null) {
+    if ((primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null ? !primitiveAndObjectGroupWithPrimitiveDefault_CharSequence.equals(that.primitiveAndObjectGroupWithPrimitiveDefault_CharSequence) : that.primitiveAndObjectGroupWithPrimitiveDefault_CharSequence != null)) {
       return false;
     }
-    if (oneThing_Long != that.oneThing_Long) {
+    if ((oneThing_Long != that.oneThing_Long)) {
       return false;
     }
-    if (anotherThing_CharSequence != null ? !anotherThing_CharSequence.equals(that.anotherThing_CharSequence) : that.anotherThing_CharSequence != null) {
+    if ((anotherThing_CharSequence != null ? !anotherThing_CharSequence.equals(that.anotherThing_CharSequence) : that.anotherThing_CharSequence != null)) {
       return false;
     }
-    if (requiredGroup_String != null ? !requiredGroup_String.equals(that.requiredGroup_String) : that.requiredGroup_String != null) {
+    if ((requiredGroup_String != null ? !requiredGroup_String.equals(that.requiredGroup_String) : that.requiredGroup_String != null)) {
       return false;
     }
-    if (requiredGroup_CharSequence != null ? !requiredGroup_CharSequence.equals(that.requiredGroup_CharSequence) : that.requiredGroup_CharSequence != null) {
+    if ((requiredGroup_CharSequence != null ? !requiredGroup_CharSequence.equals(that.requiredGroup_CharSequence) : that.requiredGroup_CharSequence != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/RLayoutInViewModelAnnotationWorksViewModel_.java b/epoxy-processortest/src/test/resources/RLayoutInViewModelAnnotationWorksViewModel_.java
index 9a055e7c8b..3417363c2b 100644
--- a/epoxy-processortest/src/test/resources/RLayoutInViewModelAnnotationWorksViewModel_.java
+++ b/epoxy-processortest/src/test/resources/RLayoutInViewModelAnnotationWorksViewModel_.java
@@ -181,10 +181,10 @@ public boolean equals(Object o) {
       return false;
     }
     RLayoutInViewModelAnnotationWorksViewModel_ that = (RLayoutInViewModelAnnotationWorksViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/SavedStateViewModel_.java b/epoxy-processortest/src/test/resources/SavedStateViewModel_.java
index c745a9fdf5..181e2b3018 100644
--- a/epoxy-processortest/src/test/resources/SavedStateViewModel_.java
+++ b/epoxy-processortest/src/test/resources/SavedStateViewModel_.java
@@ -56,7 +56,7 @@ public void bind(final SavedStateView object, EpoxyModel previousModel) {
     SavedStateViewModel_ that = (SavedStateViewModel_) previousModel;
     super.bind(object);
 
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       object.setClickListener(clickListener_String);
     }
   }
@@ -217,13 +217,13 @@ public boolean equals(Object o) {
       return false;
     }
     SavedStateViewModel_ that = (SavedStateViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null) {
+    if ((clickListener_String != null ? !clickListener_String.equals(that.clickListener_String) : that.clickListener_String != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/TestAfterBindPropsViewModel_.java b/epoxy-processortest/src/test/resources/TestAfterBindPropsViewModel_.java
index c18747aca7..1f068f5858 100644
--- a/epoxy-processortest/src/test/resources/TestAfterBindPropsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestAfterBindPropsViewModel_.java
@@ -54,11 +54,11 @@ public void bind(final TestAfterBindPropsView object, EpoxyModel previousModel)
     TestAfterBindPropsViewModel_ that = (TestAfterBindPropsViewModel_) previousModel;
     super.bind(object);
 
-    if (flagSuper_Boolean != that.flagSuper_Boolean) {
+    if ((flagSuper_Boolean != that.flagSuper_Boolean)) {
       object.setFlagSuper(flagSuper_Boolean);
     }
 
-    if (flag_Boolean != that.flag_Boolean) {
+    if ((flag_Boolean != that.flag_Boolean)) {
       object.setFlag(flag_Boolean);
     }
   }
@@ -234,16 +234,16 @@ public boolean equals(Object o) {
       return false;
     }
     TestAfterBindPropsViewModel_ that = (TestAfterBindPropsViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (flag_Boolean != that.flag_Boolean) {
+    if ((flag_Boolean != that.flag_Boolean)) {
       return false;
     }
-    if (flagSuper_Boolean != that.flagSuper_Boolean) {
+    if ((flagSuper_Boolean != that.flagSuper_Boolean)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/TestCallbackPropViewModel_.java b/epoxy-processortest/src/test/resources/TestCallbackPropViewModel_.java
index 1aede77a56..eb5256c00f 100644
--- a/epoxy-processortest/src/test/resources/TestCallbackPropViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestCallbackPropViewModel_.java
@@ -54,7 +54,7 @@ public void bind(final TestCallbackPropView object, EpoxyModel previousModel) {
     TestCallbackPropViewModel_ that = (TestCallbackPropViewModel_) previousModel;
     super.bind(object);
 
-    if ((listener_OnClickListener == null) != (that.listener_OnClickListener == null)) {
+    if (((listener_OnClickListener == null) != (that.listener_OnClickListener == null))) {
       object.setListener(listener_OnClickListener);
     }
   }
@@ -86,7 +86,7 @@ public void unbind(TestCallbackPropView object) {
     if (onModelUnboundListener_epoxyGeneratedModel != null) {
       onModelUnboundListener_epoxyGeneratedModel.onModelUnbound(this, object);
     }
-    object.setListener(null);
+    object.setListener((View.OnClickListener) null);
   }
 
   /**
@@ -228,13 +228,13 @@ public boolean equals(Object o) {
       return false;
     }
     TestCallbackPropViewModel_ that = (TestCallbackPropViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((listener_OnClickListener == null) != (that.listener_OnClickListener == null)) {
+    if (((listener_OnClickListener == null) != (that.listener_OnClickListener == null))) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/TestManyTypesViewModel_.java b/epoxy-processortest/src/test/resources/TestManyTypesViewModel_.java
index e5a032d218..e2917879b1 100644
--- a/epoxy-processortest/src/test/resources/TestManyTypesViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestManyTypesViewModel_.java
@@ -174,55 +174,55 @@ public void bind(final TestManyTypesView object, EpoxyModel previousModel) {
       object.setArrayValue(arrayValue_StringArray);
     }
 
-    if ((clickListener_OnClickListener == null) != (that.clickListener_OnClickListener == null)) {
+    if (((clickListener_OnClickListener == null) != (that.clickListener_OnClickListener == null))) {
       object.setClickListener(clickListener_OnClickListener);
     }
 
-    if (booleanValue_Boolean != null ? !booleanValue_Boolean.equals(that.booleanValue_Boolean) : that.booleanValue_Boolean != null) {
+    if ((booleanValue_Boolean != null ? !booleanValue_Boolean.equals(that.booleanValue_Boolean) : that.booleanValue_Boolean != null)) {
       object.setBooleanValue(booleanValue_Boolean);
     }
 
-    if (!title_StringAttributeData.equals(that.title_StringAttributeData)) {
+    if ((title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null)) {
       object.setTitle(title_StringAttributeData.toString(object.getContext()));
     }
 
-    if (stringValue_String != null ? !stringValue_String.equals(that.stringValue_String) : that.stringValue_String != null) {
+    if ((stringValue_String != null ? !stringValue_String.equals(that.stringValue_String) : that.stringValue_String != null)) {
       object.setStringValue(stringValue_String);
     }
 
-    if (nullableStringValue_String != null ? !nullableStringValue_String.equals(that.nullableStringValue_String) : that.nullableStringValue_String != null) {
+    if ((nullableStringValue_String != null ? !nullableStringValue_String.equals(that.nullableStringValue_String) : that.nullableStringValue_String != null)) {
       object.setNullableStringValue(nullableStringValue_String);
     }
 
-    if (intValueWithAnnotation_Int != that.intValueWithAnnotation_Int) {
+    if ((intValueWithAnnotation_Int != that.intValueWithAnnotation_Int)) {
       object.setIntValueWithAnnotation(intValueWithAnnotation_Int);
     }
 
-    if (intValueWithDimenTypeAnnotation_Int != that.intValueWithDimenTypeAnnotation_Int) {
+    if ((intValueWithDimenTypeAnnotation_Int != that.intValueWithDimenTypeAnnotation_Int)) {
       object.setIntValueWithDimenTypeAnnotation(intValueWithDimenTypeAnnotation_Int);
     }
 
-    if (intWithMultipleAnnotations_Int != that.intWithMultipleAnnotations_Int) {
+    if ((intWithMultipleAnnotations_Int != that.intWithMultipleAnnotations_Int)) {
       object.setIntWithMultipleAnnotations(intWithMultipleAnnotations_Int);
     }
 
-    if (integerValue_Integer != null ? !integerValue_Integer.equals(that.integerValue_Integer) : that.integerValue_Integer != null) {
+    if ((integerValue_Integer != null ? !integerValue_Integer.equals(that.integerValue_Integer) : that.integerValue_Integer != null)) {
       object.setIntegerValue(integerValue_Integer);
     }
 
-    if (listValue_List != null ? !listValue_List.equals(that.listValue_List) : that.listValue_List != null) {
+    if ((listValue_List != null ? !listValue_List.equals(that.listValue_List) : that.listValue_List != null)) {
       object.setListValue(listValue_List);
     }
 
-    if (intValue_Int != that.intValue_Int) {
+    if ((intValue_Int != that.intValue_Int)) {
       object.setIntValue(intValue_Int);
     }
 
-    if (intValueWithRangeAnnotation_Int != that.intValueWithRangeAnnotation_Int) {
+    if ((intValueWithRangeAnnotation_Int != that.intValueWithRangeAnnotation_Int)) {
       object.setIntValueWithRangeAnnotation(intValueWithRangeAnnotation_Int);
     }
 
-    if (boolValue_Boolean != that.boolValue_Boolean) {
+    if ((boolValue_Boolean != that.boolValue_Boolean)) {
       object.setBoolValue(boolValue_Boolean);
     }
   }
@@ -699,52 +699,52 @@ public boolean equals(Object o) {
       return false;
     }
     TestManyTypesViewModel_ that = (TestManyTypesViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (stringValue_String != null ? !stringValue_String.equals(that.stringValue_String) : that.stringValue_String != null) {
+    if ((stringValue_String != null ? !stringValue_String.equals(that.stringValue_String) : that.stringValue_String != null)) {
       return false;
     }
-    if (nullableStringValue_String != null ? !nullableStringValue_String.equals(that.nullableStringValue_String) : that.nullableStringValue_String != null) {
+    if ((nullableStringValue_String != null ? !nullableStringValue_String.equals(that.nullableStringValue_String) : that.nullableStringValue_String != null)) {
       return false;
     }
-    if (intValue_Int != that.intValue_Int) {
+    if ((intValue_Int != that.intValue_Int)) {
       return false;
     }
-    if (intValueWithAnnotation_Int != that.intValueWithAnnotation_Int) {
+    if ((intValueWithAnnotation_Int != that.intValueWithAnnotation_Int)) {
       return false;
     }
-    if (intValueWithRangeAnnotation_Int != that.intValueWithRangeAnnotation_Int) {
+    if ((intValueWithRangeAnnotation_Int != that.intValueWithRangeAnnotation_Int)) {
       return false;
     }
-    if (intValueWithDimenTypeAnnotation_Int != that.intValueWithDimenTypeAnnotation_Int) {
+    if ((intValueWithDimenTypeAnnotation_Int != that.intValueWithDimenTypeAnnotation_Int)) {
       return false;
     }
-    if (intWithMultipleAnnotations_Int != that.intWithMultipleAnnotations_Int) {
+    if ((intWithMultipleAnnotations_Int != that.intWithMultipleAnnotations_Int)) {
       return false;
     }
-    if (integerValue_Integer != null ? !integerValue_Integer.equals(that.integerValue_Integer) : that.integerValue_Integer != null) {
+    if ((integerValue_Integer != null ? !integerValue_Integer.equals(that.integerValue_Integer) : that.integerValue_Integer != null)) {
       return false;
     }
-    if (boolValue_Boolean != that.boolValue_Boolean) {
+    if ((boolValue_Boolean != that.boolValue_Boolean)) {
       return false;
     }
-    if (booleanValue_Boolean != null ? !booleanValue_Boolean.equals(that.booleanValue_Boolean) : that.booleanValue_Boolean != null) {
+    if ((booleanValue_Boolean != null ? !booleanValue_Boolean.equals(that.booleanValue_Boolean) : that.booleanValue_Boolean != null)) {
       return false;
     }
     if (!Arrays.equals(arrayValue_StringArray, that.arrayValue_StringArray)) {
       return false;
     }
-    if (listValue_List != null ? !listValue_List.equals(that.listValue_List) : that.listValue_List != null) {
+    if ((listValue_List != null ? !listValue_List.equals(that.listValue_List) : that.listValue_List != null)) {
       return false;
     }
-    if ((clickListener_OnClickListener == null) != (that.clickListener_OnClickListener == null)) {
+    if (((clickListener_OnClickListener == null) != (that.clickListener_OnClickListener == null))) {
       return false;
     }
-    if (title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null) {
+    if ((title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/TestNullStringOverloadsViewModel_.java b/epoxy-processortest/src/test/resources/TestNullStringOverloadsViewModel_.java
index c16d678e97..f25caf5786 100644
--- a/epoxy-processortest/src/test/resources/TestNullStringOverloadsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestNullStringOverloadsViewModel_.java
@@ -52,7 +52,7 @@ public void bind(final TestNullStringOverloadsView object, EpoxyModel previousMo
     TestNullStringOverloadsViewModel_ that = (TestNullStringOverloadsViewModel_) previousModel;
     super.bind(object);
 
-    if (!title_StringAttributeData.equals(that.title_StringAttributeData)) {
+    if ((title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null)) {
       object.setTitle(title_StringAttributeData.toString(object.getContext()));
     }
   }
@@ -253,13 +253,13 @@ public boolean equals(Object o) {
       return false;
     }
     TestNullStringOverloadsViewModel_ that = (TestNullStringOverloadsViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null) {
+    if ((title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/TestStringOverloadsViewModel_.java b/epoxy-processortest/src/test/resources/TestStringOverloadsViewModel_.java
index dc6d3361e7..f718687512 100644
--- a/epoxy-processortest/src/test/resources/TestStringOverloadsViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestStringOverloadsViewModel_.java
@@ -64,7 +64,7 @@ else if (assignedAttributes_epoxyGeneratedModel.get(1)) {
       object.setTitle(title_List);
     }
     else {
-      object.setTitle((List<CharSequence>) null);
+      object.setTitle(title_List);
     }
   }
 
@@ -77,32 +77,23 @@ public void bind(final TestStringOverloadsView object, EpoxyModel previousModel)
     TestStringOverloadsViewModel_ that = (TestStringOverloadsViewModel_) previousModel;
     super.bind(object);
 
-    if (!titleViaValueShortcut_StringAttributeData.equals(that.titleViaValueShortcut_StringAttributeData)) {
+    if ((titleViaValueShortcut_StringAttributeData != null ? !titleViaValueShortcut_StringAttributeData.equals(that.titleViaValueShortcut_StringAttributeData) : that.titleViaValueShortcut_StringAttributeData != null)) {
       object.setTitleViaValueShortcut(titleViaValueShortcut_StringAttributeData.toString(object.getContext()));
     }
 
-    if (assignedAttributes_epoxyGeneratedModel.equals(that.assignedAttributes_epoxyGeneratedModel)) {
-      if (assignedAttributes_epoxyGeneratedModel.get(0)) {
-        if (title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null) {
-          object.setTitle(title_StringAttributeData.toString(object.getContext()));
-        }
-      }
-       else if (assignedAttributes_epoxyGeneratedModel.get(1)) {
-        if (title_List != null ? !title_List.equals(that.title_List) : that.title_List != null) {
-          object.setTitle(title_List);
-        }
-      }
-    }
-    else {
-      if (assignedAttributes_epoxyGeneratedModel.get(0) && !that.assignedAttributes_epoxyGeneratedModel.get(0)) {
+    if (assignedAttributes_epoxyGeneratedModel.get(0)) {
+      if (!that.assignedAttributes_epoxyGeneratedModel.get(0) || (title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null)) {
         object.setTitle(title_StringAttributeData.toString(object.getContext()));
       }
-       else if (assignedAttributes_epoxyGeneratedModel.get(1) && !that.assignedAttributes_epoxyGeneratedModel.get(1)) {
+    }
+    else if (assignedAttributes_epoxyGeneratedModel.get(1)) {
+      if (!that.assignedAttributes_epoxyGeneratedModel.get(1) || (title_List != null ? !title_List.equals(that.title_List) : that.title_List != null)) {
         object.setTitle(title_List);
       }
-      else {
-        object.setTitle((List<CharSequence>) null);
-      }
+    }
+    // A value was not set so we should use the default value, but we only need to set it if the previous model had a custom value set.
+    else if (that.assignedAttributes_epoxyGeneratedModel.get(0) || that.assignedAttributes_epoxyGeneratedModel.get(1)) {
+      object.setTitle(title_List);
     }
   }
 
@@ -388,19 +379,19 @@ public boolean equals(Object o) {
       return false;
     }
     TestStringOverloadsViewModel_ that = (TestStringOverloadsViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null) {
+    if ((title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null)) {
       return false;
     }
-    if (title_List != null ? !title_List.equals(that.title_List) : that.title_List != null) {
+    if ((title_List != null ? !title_List.equals(that.title_List) : that.title_List != null)) {
       return false;
     }
-    if (titleViaValueShortcut_StringAttributeData != null ? !titleViaValueShortcut_StringAttributeData.equals(that.titleViaValueShortcut_StringAttributeData) : that.titleViaValueShortcut_StringAttributeData != null) {
+    if ((titleViaValueShortcut_StringAttributeData != null ? !titleViaValueShortcut_StringAttributeData.equals(that.titleViaValueShortcut_StringAttributeData) : that.titleViaValueShortcut_StringAttributeData != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/TestTextPropViewModel_.java b/epoxy-processortest/src/test/resources/TestTextPropViewModel_.java
index 3615dc2fc1..b691859542 100644
--- a/epoxy-processortest/src/test/resources/TestTextPropViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TestTextPropViewModel_.java
@@ -58,7 +58,7 @@ public void bind(final TestTextPropView object, EpoxyModel previousModel) {
     TestTextPropViewModel_ that = (TestTextPropViewModel_) previousModel;
     super.bind(object);
 
-    if (!title_StringAttributeData.equals(that.title_StringAttributeData)) {
+    if ((title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null)) {
       object.setTitle(title_StringAttributeData.toString(object.getContext()));
     }
   }
@@ -261,13 +261,13 @@ public boolean equals(Object o) {
       return false;
     }
     TestTextPropViewModel_ that = (TestTextPropViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null) {
+    if ((title_StringAttributeData != null ? !title_StringAttributeData.equals(that.title_StringAttributeData) : that.title_StringAttributeData != null)) {
       return false;
     }
     return true;
diff --git a/epoxy-processortest/src/test/resources/TextPropDefaultViewModel_.java b/epoxy-processortest/src/test/resources/TextPropDefaultViewModel_.java
index 18ad16b336..49477f4d39 100644
--- a/epoxy-processortest/src/test/resources/TextPropDefaultViewModel_.java
+++ b/epoxy-processortest/src/test/resources/TextPropDefaultViewModel_.java
@@ -63,11 +63,11 @@ public void bind(final TextPropDefaultView object, EpoxyModel previousModel) {
     TextPropDefaultViewModel_ that = (TextPropDefaultViewModel_) previousModel;
     super.bind(object);
 
-    if (!textWithDefault_StringAttributeData.equals(that.textWithDefault_StringAttributeData)) {
+    if ((textWithDefault_StringAttributeData != null ? !textWithDefault_StringAttributeData.equals(that.textWithDefault_StringAttributeData) : that.textWithDefault_StringAttributeData != null)) {
       object.textWithDefault(textWithDefault_StringAttributeData.toString(object.getContext()));
     }
 
-    if (!nullableTextWithDefault_StringAttributeData.equals(that.nullableTextWithDefault_StringAttributeData)) {
+    if ((nullableTextWithDefault_StringAttributeData != null ? !nullableTextWithDefault_StringAttributeData.equals(that.nullableTextWithDefault_StringAttributeData) : that.nullableTextWithDefault_StringAttributeData != null)) {
       object.nullableTextWithDefault(nullableTextWithDefault_StringAttributeData.toString(object.getContext()));
     }
   }
@@ -332,16 +332,16 @@ public boolean equals(Object o) {
       return false;
     }
     TextPropDefaultViewModel_ that = (TextPropDefaultViewModel_) o;
-    if ((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null)) {
+    if (((onModelBoundListener_epoxyGeneratedModel == null) != (that.onModelBoundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if ((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null)) {
+    if (((onModelUnboundListener_epoxyGeneratedModel == null) != (that.onModelUnboundListener_epoxyGeneratedModel == null))) {
       return false;
     }
-    if (textWithDefault_StringAttributeData != null ? !textWithDefault_StringAttributeData.equals(that.textWithDefault_StringAttributeData) : that.textWithDefault_StringAttributeData != null) {
+    if ((textWithDefault_StringAttributeData != null ? !textWithDefault_StringAttributeData.equals(that.textWithDefault_StringAttributeData) : that.textWithDefault_StringAttributeData != null)) {
       return false;
     }
-    if (nullableTextWithDefault_StringAttributeData != null ? !nullableTextWithDefault_StringAttributeData.equals(that.nullableTextWithDefault_StringAttributeData) : that.nullableTextWithDefault_StringAttributeData != null) {
+    if ((nullableTextWithDefault_StringAttributeData != null ? !nullableTextWithDefault_StringAttributeData.equals(that.nullableTextWithDefault_StringAttributeData) : that.nullableTextWithDefault_StringAttributeData != null)) {
       return false;
     }
     return true;
diff --git a/kotlinsample/src/androidTest/java/com/airbnb/epoxy/kotlinsample/ExampleInstrumentedTest.kt b/kotlinsample/src/androidTest/java/com/airbnb/epoxy/kotlinsample/ExampleInstrumentedTest.kt
deleted file mode 100644
index 5b90311b11..0000000000
--- a/kotlinsample/src/androidTest/java/com/airbnb/epoxy/kotlinsample/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.airbnb.epoxy.kotlinsample
-
-import android.support.test.InstrumentationRegistry
-import android.support.test.runner.AndroidJUnit4
-
-import org.junit.Test
-import org.junit.runner.RunWith
-
-import org.junit.Assert.*
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
-    @Test
-    fun useAppContext() {
-        // Context of the app under test.
-        val appContext = InstrumentationRegistry.getTargetContext()
-        assertEquals("com.airbnb.epoxy.kotlinsample", appContext.packageName)
-    }
-}