diff --git a/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java b/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
index 4434f1b..d455ff7 100644
--- a/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
+++ b/core/src/main/java/org/apache/commons/digester3/ExtendedBaseRules.java
@@ -465,7 +465,7 @@
                     }
                     return -1;
                 }
-                else if ( i2 == null )
+                if ( i2 == null )
                 {
                     return 1;
                 }
diff --git a/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java b/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
index a8236ba..c03e038 100644
--- a/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
+++ b/core/src/main/java/org/apache/commons/digester3/xmlrules/CallParamRule.java
@@ -63,15 +63,11 @@
         }
         else
         {
-            if ( fromStack == null )
-            {
-                builder.fromAttribute( attributeName );
-            }
-            else
-            {
+            if ( fromStack != null ) {
                 // specifying both from-stack and attribute name is not allowed
                 throw new RuntimeException( "Attributes from-stack and attrname cannot both be present." );
             }
+            builder.fromAttribute( attributeName );
         }
     }