Work on migration to new Java 1.8 APIs.