Various cleanups for Java 8.