Index: /trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java	(revision 14097)
+++ /trunk/src/org/openstreetmap/josm/data/osm/search/SearchCompiler.java	(revision 14098)
@@ -1220,7 +1220,5 @@
                 return false;
             ExactType other = (ExactType) obj;
-            if (type != other.type)
-                return false;
-            return true;
+            return type == other.type;
         }
     }
@@ -1392,9 +1390,6 @@
                 return false;
             Nth other = (Nth) obj;
-            if (modulo != other.modulo)
-                return false;
-            if (nth != other.nth)
-                return false;
-            return true;
+            return modulo == other.modulo
+                   && nth == other.nth;
         }
     }
@@ -1451,9 +1446,6 @@
                 return false;
             RangeMatch other = (RangeMatch) obj;
-            if (max != other.max)
-                return false;
-            if (min != other.min)
-                return false;
-            return true;
+            return max == other.max
+                && min == other.min;
         }
     }
@@ -1859,7 +1851,5 @@
                 return false;
             InArea other = (InArea) obj;
-            if (all != other.all)
-                return false;
-            return true;
+            return all == other.all;
         }
     }
Index: /trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java	(revision 14097)
+++ /trunk/src/org/openstreetmap/josm/tools/template_engine/CompoundTemplateEntry.java	(revision 14098)
@@ -69,7 +69,5 @@
             return false;
         CompoundTemplateEntry other = (CompoundTemplateEntry) obj;
-        if (!Arrays.equals(entries, other.entries))
-            return false;
-        return true;
+        return Arrays.equals(entries, other.entries);
     }
 }