Upgraded to Java 1.7.  Inferred generics where possible.