Migrate to Java 7... mostly add HashMap<>() shorthand