Migrating the IDV to Java 7