More Java 8 cleanup.