Move to Java 8 Optional #2.