Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 16621)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 16622)
@@ -29,5 +29,4 @@
 import java.util.TreeMap;
 import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -184,7 +183,4 @@
     protected final SortedMap<String, Setting<?>> defaultsMap = new TreeMap<>();
 
-    private final Predicate<Entry<String, Setting<?>>> NO_DEFAULT_SETTINGS_ENTRY =
-            e -> !e.getValue().equals(defaultsMap.get(e.getKey()));
-
     /**
      * Indicates whether {@link #init(boolean)} completed successfully.
@@ -420,5 +416,5 @@
      */
     public synchronized void save() throws IOException {
-        save(getPreferenceFile(), settingsMap.entrySet().stream().filter(NO_DEFAULT_SETTINGS_ENTRY), false);
+        save(getPreferenceFile(), settingsMap.entrySet().stream().filter(e -> !e.getValue().equals(defaultsMap.get(e.getKey()))), false);
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 16621)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 16622)
@@ -16,5 +16,4 @@
 import java.util.Map.Entry;
 import java.util.Objects;
-import java.util.function.Predicate;
 
 import javax.swing.JOptionPane;
@@ -42,17 +41,12 @@
 public final class HistoryBrowserDialogManager implements LayerChangeListener {
 
-    static final class UnloadedHistoryPredicate implements Predicate<PrimitiveId> {
-        private final HistoryDataSet hds = HistoryDataSet.getInstance();
-
-        @Override
-        public boolean test(PrimitiveId p) {
-            History h = hds.getHistory(p);
-            if (h == null)
-                // reload if the history is not in the cache yet
-                return true;
-            else
-                // reload if the history object of the selected object is not in the cache yet
-                return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
-        }
+    private static boolean isUnloaded(PrimitiveId p) {
+        History h = HistoryDataSet.getInstance().getHistory(p);
+        if (h == null)
+            // reload if the history is not in the cache yet
+            return true;
+        else
+            // reload if the history object of the selected object is not in the cache yet
+            return !p.isNew() && h.getByVersion(p.getUniqueId()) == null;
     }
 
@@ -62,8 +56,4 @@
 
     private final LinkedHashMap<Long, HistoryBrowserDialog> dialogs = new LinkedHashMap<>();
-
-    private final Predicate<PrimitiveId> unloadedHistoryPredicate = new UnloadedHistoryPredicate();
-
-    private final Predicate<PrimitiveId> notNewPredicate = p -> !p.isNew();
 
     private static final List<HistoryHook> hooks = new ArrayList<>();
@@ -217,5 +207,5 @@
         final List<PrimitiveId> realPrimitives = new ArrayList<>(primitives);
         hooks.forEach(h -> h.modifyRequestedIds(realPrimitives));
-        final Collection<? extends PrimitiveId> notNewPrimitives = SubclassFilteredCollection.filter(realPrimitives, notNewPredicate);
+        final Collection<? extends PrimitiveId> notNewPrimitives = SubclassFilteredCollection.filter(realPrimitives, p1 -> !p1.isNew());
         if (notNewPrimitives.isEmpty()) {
             JOptionPane.showMessageDialog(
@@ -237,5 +227,5 @@
         }
 
-        Collection<? extends PrimitiveId> toLoad = SubclassFilteredCollection.filter(notNewPrimitives, unloadedHistoryPredicate);
+        Collection<? extends PrimitiveId> toLoad = SubclassFilteredCollection.filter(notNewPrimitives, HistoryBrowserDialogManager::isUnloaded);
         if (!toLoad.isEmpty()) {
             MainApplication.worker.submit(new HistoryLoadTask(parent).addPrimitiveIds(toLoad));