Changes for Java 7.