Index: trunk/src/org/openstreetmap/josm/data/Preferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9790)
+++ trunk/src/org/openstreetmap/josm/data/Preferences.java	(revision 9793)
@@ -1086,5 +1086,5 @@
                 Set evalue = (Set) e.getValue();
                 JsonArrayBuilder a = Json.createArrayBuilder();
-                for (Object evo: (Collection) evalue) {
+                for (Object evo: evalue) {
                     a.add(evo.toString());
                 }
@@ -1418,4 +1418,5 @@
      * setting, add it to the list here with an expiry date (written as comment). If you
      * see something with an expiry date in the past, remove it from the list.
+     * @param loadedVersion JOSM version when the preferences file was written
      */
     private void removeObsolete(int loadedVersion) {
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9790)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java	(revision 9793)
@@ -33,5 +33,4 @@
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.ForkJoinTask;
@@ -261,4 +260,5 @@
         }
     }
+
     /* can be set by tests, if detailed benchmark data is requested */
     public BenchmarkData benchmarkData = null;