Prepare for Java 6/7 to Java 8 split.