Index: /trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java	(revision 446)
+++ /trunk/src/org/openstreetmap/josm/data/gpx/WithAttributes.java	(revision 447)
@@ -15,5 +15,5 @@
 public class WithAttributes {
 	
-	public Map<String, Object> attr = new HashMap<String, Object>();
+	public Map<String, Object> attr = new HashMap<String, Object>(0);
 	
 	public String getString(String key) {
Index: /trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 446)
+++ /trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 447)
@@ -13,4 +13,5 @@
 import java.util.HashMap;
 import java.util.LinkedList;
+import java.util.ArrayList;
 import java.util.Stack;
 import java.util.Map;
@@ -100,5 +101,5 @@
 					states.push(currentState);
 					currentState = state.trkseg;
-					currentTrackSeg = new LinkedList<WayPoint>();
+					currentTrackSeg = new ArrayList<WayPoint>();
 				}
 				if (qName.equals("link")) {