Moving to Java 5, part 2