Migration to Java 5, part 1