Prepare for Java 9...